Merge pull request #207 from sbt/wip/windows

Fix "was unexpected at this time."

citest/build.sbt

@@ -16,12 +16,9 @@ lazy val root = (project in file("."))
       assert(xs(4) startsWith "[info] The current project")
       assert(xs(5) startsWith "[info] The current project is built against Scala 2.12.4")
 
-      val ys = IO.readLines(file("err.txt")).toVector
+      val ys = IO.readLines(file("err.txt")).toVector.distinct
 
-      println(ys)
-
-      assert(ys.size == 2)
+      assert(ys.size == 1, s"ys has more than one item: $ys")
       assert(ys(0) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
-      assert(ys(1) startsWith "Java HotSpot(TM) 64-Bit Server VM warning")
     }
   )

citest/test.bat

@@ -7,6 +7,8 @@ unzip ..\target\universal\sbt.zip -d freshly-baked
 
 SETLOCAL
 
+"freshly-baked\sbt\bin\sbt" about
+
 SET JAVA_HOME=C:\jdk9
 SET PATH=C:\jdk9\bin;%PATH%
 SET SBT_OPTS=-Xmx4g -Dfile.encoding=UTF8

src/universal/bin/sbt.bat

@@ -129,7 +129,7 @@ exit /B 1
 
 :copyrt
 if /I "%JAVA_VERSION%" GEQ "9" (
-  set rtexport=%SBT_HOME%java9-rt-export.jar
+  set rtexport=!SBT_HOME!java9-rt-export.jar
 
   "%_JAVACMD%" %_JAVA_OPTS% %SBT_OPTS% -jar "!rtexport!" --rt-ext-dir > "%TEMP%.\rtext.txt"
   set /p java9_ext= < "%TEMP%.\rtext.txt"