Merge pull request #4300 from sjrd/fix-windows-stuff

sjrd · web-flow · commit 88a19cf1be14 · 2020-11-26T10:06:31.000+01:00
Fix usages of Jimfs in tests on Windows.
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,7 +4,7 @@ environment:
   global:
     NODEJS_VERSION: "12"
     JAVA_HOME: C:\Program Files\Java\jdk1.8.0
-    SCALA_VERSION: 2.12.11
+    SCALA_VERSION: 2.12.12
 install:
   - ps: Install-Product node $env:NODEJS_VERSION
   - npm install
@@ -14,7 +14,8 @@ install:
 build: off
 test_script:
   # Very far from testing everything, but at least it is a good sanity check
-  - cmd: sbt ";clean;++%SCALA_VERSION%;testSuite2_12/test"
+  # For slow things (partest and scripted), we execute only one test
+  - cmd: sbt ";clean;++%SCALA_VERSION%;testSuite2_12/test;linker2_12/test;partestSuite2_12/testOnly -- --fastOpt run/option-fold.scala;sbtPlugin/scripted settings/module-init"
 cache:
   - C:\sbt
   - C:\Users\appveyor\.ivy2\cache
diff --git a/linker/jvm/src/test/scala/org/scalajs/linker/PathOutputDirectoryTest.scala b/linker/jvm/src/test/scala/org/scalajs/linker/PathOutputDirectoryTest.scala
@@ -36,7 +36,7 @@ class PathOutputDirectoryTest {
 
   @Test
   def avoidUnnecessaryWrite(): AsyncResult = await {
-    val dir = Jimfs.newFileSystem().getPath("/tmp")
+    val dir = Jimfs.newFileSystem().getPath("tmp").toAbsolutePath()
     Files.createDirectory(dir)
 
     val fileName = "file.js"
@@ -59,7 +59,7 @@ class PathOutputDirectoryTest {
 
   @Test
   def readFull(): AsyncResult = await {
-    val dir = Jimfs.newFileSystem().getPath("/tmp")
+    val dir = Jimfs.newFileSystem().getPath("tmp").toAbsolutePath()
     Files.createDirectory(dir)
 
     val fileName = "file.js"
@@ -82,7 +82,7 @@ class PathOutputDirectoryTest {
       .setAttributeViews("basic", "posix")
       .build()
 
-    val dir = Jimfs.newFileSystem(config).getPath("/tmp")
+    val dir = Jimfs.newFileSystem(config).getPath("/tmp") // we forced Unix, so /tmp is fine
     Files.createDirectory(dir)
 
     val fileName = "file.js"
diff --git a/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala b/partest/src/main/scala/scala/tools/nsc/MainGenericRunner.scala
@@ -96,7 +96,7 @@ class MainGenericRunner {
     val linker = StandardImpl.linker(linkerConfig)
 
     val sjsCode = {
-      val dir = Jimfs.newFileSystem().getPath("/tmp")
+      val dir = Jimfs.newFileSystem().getPath("tmp").toAbsolutePath()
       Files.createDirectory(dir)
 
       val cache = StandardImpl.irFileCache().newCache
