diff --git a/compile/src/test/scala/CompileTest.scala b/compile/src/test/scala/CompileTest.scala index 38763e7a2..165307169 100644 --- a/compile/src/test/scala/CompileTest.scala +++ b/compile/src/test/scala/CompileTest.scala @@ -9,9 +9,8 @@ object CompileTest extends Specification { "Analysis compiler" should { "compile basic sources" in { - WithCompiler( "2.7.4" )(testCompileAnalysis) - WithCompiler( "2.7.5" )(testCompileAnalysis) - WithCompiler( "2.7.7" )(testCompileAnalysis) + WithCompiler( "2.9.1" )(testCompileAnalysis) + WithCompiler( "2.9.0-1" )(testCompileAnalysis) WithCompiler( "2.8.0" )(testCompileAnalysis) WithCompiler( "2.8.1" )(testCompileAnalysis) } @@ -19,10 +18,10 @@ object CompileTest extends Specification "Raw compiler" should { "Properly handle classpaths" in { - testClasspath("2.7.4") - testClasspath("2.7.7") - testClasspath("2.8.0") + testClasspath("2.9.1") + testClasspath("2.9.0-1") testClasspath("2.8.1") + testClasspath("2.8.0") } } diff --git a/compile/src/test/scala/TestCompile.scala b/compile/src/test/scala/TestCompile.scala index 0f6913227..3f9671675 100644 --- a/compile/src/test/scala/TestCompile.scala +++ b/compile/src/test/scala/TestCompile.scala @@ -8,7 +8,7 @@ package compiler object TestCompile { - def allVersions = List("2.8.1", "2.9.0-1", "2.8.0") + def allVersions = List("2.8.1", "2.9.0-1", "2.8.0", "2.9.1") /** Tests running the compiler interface with the analyzer plugin with a test callback. The test callback saves all information * that the plugin sends it for post-compile analysis by the provided function.*/ def apply[T](scalaVersion: String, sources: Seq[File], outputDirectory: File, options: Seq[String]) diff --git a/launch/src/test/scala/ScalaProviderTest.scala b/launch/src/test/scala/ScalaProviderTest.scala index 4c2fe3adf..810e551ae 100644 --- a/launch/src/test/scala/ScalaProviderTest.scala +++ b/launch/src/test/scala/ScalaProviderTest.scala @@ -11,12 +11,10 @@ object ScalaProviderTest extends Specification { def provide = addToSusVerb("provide") "Launch" should provide { - "ClassLoader for Scala 2.7.4" in { checkScalaLoader("2.7.4") } - "ClassLoader for Scala 2.7.5" in { checkScalaLoader("2.7.5") } - "ClassLoader for Scala 2.7.7" in { checkScalaLoader("2.7.7") } "ClassLoader for Scala 2.8.0" in { checkScalaLoader("2.8.0") } "ClassLoader for Scala 2.8.1" in { checkScalaLoader("2.8.1") } "ClassLoader for Scala 2.9.0-1" in { checkScalaLoader("2.9.0-1") } + "ClassLoader for Scala 2.9.1" in { checkScalaLoader("2.9.1") } } "Launch" should { @@ -74,7 +72,7 @@ object LaunchTest def mapScalaVersion(versionNumber: String) = scalaVersionMap.find(_._2 == versionNumber).getOrElse { error("Scala version number " + versionNumber + " from library.properties has no mapping")}._1 - val scalaVersionMap = Map("2.9.0-1" -> "2.9.0.1") ++ List("2.7.4", "2.7.5", "2.7.6", "2.7.7", "2.8.0", "2.8.1").map(v => (v, v + ".final")) + val scalaVersionMap = Map("2.9.0-1" -> "2.9.0.1") ++ List("2.8.0", "2.8.1", "2.9.1").map(v => (v, v + ".final")) def getScalaVersion: String = getScalaVersion(getClass.getClassLoader) def getScalaVersion(loader: ClassLoader): String = loadProperties(loader, "library.properties").getProperty("version.number") lazy val AppVersion = loadProperties(getClass.getClassLoader, "xsbt.version.properties").getProperty("version") diff --git a/main/CommandSupport.scala b/main/CommandSupport.scala index 18f677d81..1cb57bb9e 100644 --- a/main/CommandSupport.scala +++ b/main/CommandSupport.scala @@ -194,7 +194,7 @@ Multi + " command1 " + Multi + """ command2 ... """ def AppendCommand = "append" - def AppendLastBrief = (Append + " command", AppendLastDetailed) + def AppendLastBrief = (AppendCommand + " command", AppendLastDetailed) def AppendLastDetailed = "Appends `command` to list of commands to run." val AliasCommand = "alias" diff --git a/sbt/src/sbt-test/source-dependencies/binary/test b/sbt/src/sbt-test/source-dependencies/binary/test index 148bfa51e..058c5492c 100644 --- a/sbt/src/sbt-test/source-dependencies/binary/test +++ b/sbt/src/sbt-test/source-dependencies/binary/test @@ -1,3 +1,6 @@ -> use/compile +# done this way because last modified times often have ~1s resolution +> use/package +$ sleep 2000 + $ copy-file changes/Break.scala dep/A.scala -> use/compile diff --git a/sbt/src/sbt-test/source-dependencies/export-jars/test b/sbt/src/sbt-test/source-dependencies/export-jars/test index 4955eccc5..68340bd37 100644 --- a/sbt/src/sbt-test/source-dependencies/export-jars/test +++ b/sbt/src/sbt-test/source-dependencies/export-jars/test @@ -3,8 +3,10 @@ $ copy-file changes/B.scala B.scala $ copy-file changes/A1.scala a/A.scala > run 1 $ copy-file changes/A2.scala a/A.scala +$ sleep 2000 > run 2 $ copy-file changes/A3.scala a/A.scala +$ sleep 2000 > run 3 $ copy-file changes/build2.sbt build.sbt @@ -13,6 +15,8 @@ $ copy-file changes/build2.sbt build.sbt $ copy-file changes/A1.scala a/A.scala > run 1 $ copy-file changes/A2.scala a/A.scala +$ sleep 2000 > run 2 $ copy-file changes/A3.scala a/A.scala +$ sleep 2000 > run 3 \ No newline at end of file