Merge pull request #4937 from eatkins/miscellaneous-fixups

Miscellaneous fixups

main/src/main/scala/sbt/internal/SysProp.scala

@@ -87,7 +87,7 @@ object SysProp {
   def closeClassLoaders: Boolean = getOrTrue("sbt.classloader.close")
 
   def fileCacheSize: Long =
-    SizeParser(System.getProperty("sbt.file.cache.size", "128M")).getOrElse(128 * 1024 * 1024)
+    SizeParser(System.getProperty("sbt.file.cache.size", "128M")).getOrElse(128L * 1024 * 1024)
   def supershell: Boolean = color && getOrTrue("sbt.supershell")
 
   def supershellSleep: Long = long("sbt.supershell.sleep", 100L)

project/Scripted.scala

@@ -60,7 +60,7 @@ object Scripted {
     // Grabs the filenames from a given test group in the current page definition.
     def pagedFilenames(group: String, page: ScriptedTestPage): Seq[String] = {
       val files = pairMap(group).toSeq.sortBy(_.toLowerCase)
-      val pageSize = files.size / page.total
+      val pageSize = if (page.total == 0) files.size else files.size / page.total
       // The last page may loose some values, so we explicitly keep them
       val dropped = files.drop(pageSize * (page.page - 1))
       if (page.page == page.total) dropped