Move /tests/partest-test to /tests/vulpix-tests/

Author: OlivierBlanvillain

compiler/test/dotty/tools/vulpix/VulpixMetaTests.scala

@@ -21,7 +21,7 @@ class VulpixMetaTests extends ParallelTesting {
   implicit val summaryReport: SummaryReporting = new SummaryReport
   implicit def testGroup: TestGroup = TestGroup("VulpixMetaTests")
 
-  @Test def compilePos: Unit = compileFilesInDir("../tests/meta-tests/pos", defaultOptions).checkCompile()
-  @Test def compileNeg: Unit = compileFilesInDir("../tests/meta-tests/neg", defaultOptions).checkExpectedErrors()
-  @Test def runAll: Unit     = compileFilesInDir("../tests/meta-tests/run", defaultOptions).checkRuns()
+  @Test def compilePos: Unit = compileFilesInDir("../tests/vulpix-tests/meta/pos", defaultOptions).checkCompile()
+  @Test def compileNeg: Unit = compileFilesInDir("../tests/vulpix-tests/meta/neg", defaultOptions).checkExpectedErrors()
+  @Test def runAll: Unit     = compileFilesInDir("../tests/vulpix-tests/meta/run", defaultOptions).checkRuns()
 }

compiler/test/dotty/tools/vulpix/VulpixUnitTests.scala

@@ -23,7 +23,7 @@ class VulpixUnitTests extends ParallelTesting {
 
   @Test def missingFile: Unit =
     try {
-      compileFile("../tests/partest-test/i-dont-exist.scala", defaultOptions).expectFailure.checkExpectedErrors()
+      compileFile("../tests/vulpix-tests/unit/i-dont-exist.scala", defaultOptions).expectFailure.checkExpectedErrors()
       fail("didn't fail properly")
     }
     catch {
@@ -32,63 +32,63 @@ class VulpixUnitTests extends ParallelTesting {
     }
 
   @Test def pos1Error: Unit =
-    compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.checkCompile()
+    compileFile("../tests/vulpix-tests/unit/posFail1Error.scala", defaultOptions).expectFailure.checkCompile()
 
   @Test def negMissingAnnot: Unit =
-    compileFile("../tests/partest-test/negMissingAnnot.scala", defaultOptions).expectFailure.checkExpectedErrors()
+    compileFile("../tests/vulpix-tests/unit/negMissingAnnot.scala", defaultOptions).expectFailure.checkExpectedErrors()
 
   @Test def negAnnotWrongLine: Unit =
-    compileFile("../tests/partest-test/negAnnotWrongLine.scala", defaultOptions).expectFailure.checkExpectedErrors()
+    compileFile("../tests/vulpix-tests/unit/negAnnotWrongLine.scala", defaultOptions).expectFailure.checkExpectedErrors()
 
   @Test def negTooManyAnnots: Unit =
-    compileFile("../tests/partest-test/negTooManyAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
+    compileFile("../tests/vulpix-tests/unit/negTooManyAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
 
   @Test def negNoPositionAnnot: Unit =
-    compileFile("../tests/partest-test/negNoPositionAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
+    compileFile("../tests/vulpix-tests/unit/negNoPositionAnnots.scala", defaultOptions).expectFailure.checkExpectedErrors()
 
   @Test def runCompileFail: Unit =
-    compileFile("../tests/partest-test/posFail1Error.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/posFail1Error.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def runWrongOutput1: Unit =
-    compileFile("../tests/partest-test/runWrongOutput1.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/runWrongOutput1.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def runWrongOutput2: Unit =
-    compileFile("../tests/partest-test/runWrongOutput2.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/runWrongOutput2.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def runDiffOutput1: Unit =
-    compileFile("../tests/partest-test/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def runStackOverflow: Unit =
-    compileFile("../tests/partest-test/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def runOutRedirects: Unit =
-    compileFile("../tests/partest-test/i2147.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/i2147.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def infiteNonRec: Unit =
-    compileFile("../tests/partest-test/infinite.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/infinite.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def infiteTailRec: Unit =
-    compileFile("../tests/partest-test/infiniteTail.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/infiniteTail.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def infiniteAlloc: Unit =
-    compileFile("../tests/partest-test/infiniteAlloc.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/infiniteAlloc.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def deadlock: Unit =
-    compileFile("../tests/partest-test/deadlock.scala", defaultOptions).expectFailure.checkRuns()
+    compileFile("../tests/vulpix-tests/unit/deadlock.scala", defaultOptions).expectFailure.checkRuns()
 
   @Test def badJava: Unit =
-    try compileFile("../tests/partest-test/BadJava.java", defaultOptions).suppressAllOutput.checkCompile()
+    try compileFile("../tests/vulpix-tests/unit/BadJava.java", defaultOptions).suppressAllOutput.checkCompile()
     catch {
       case ae: AssertionError => assert(ae.getMessage.contains("java compilation failed"))
     }
 
   @Test def runTimeout: Unit = {
     try {
-      compileFile("../tests/partest-test/timeout.scala", defaultOptions).checkRuns()
+      compileFile("../tests/vulpix-tests/unit/timeout.scala", defaultOptions).checkRuns()
       assert(false, "unreachable")
     } catch {
       case ae: AssertionError =>
-        assert(ae.getMessage == "Run test failed, but should not, reasons:\n  - test '../tests/partest-test/timeout.scala' timed out")
+        assert(ae.getMessage == "Run test failed, but should not, reasons:\n  - test '../tests/vulpix-tests/unit/timeout.scala' timed out")
     }
   }
 }

project/scripts/cmdTests

@@ -110,4 +110,4 @@ while read actual <&3 && read expected <&4; do
       exit -1
     fi
   fi
-done 3<"$tmp1" 4<"./tests/meta-tests/sbt-output.check"
+done 3<"$tmp1" 4<"./tests/vulpix-tests/meta/sbt-output.check"

tests/meta-tests/neg/missing-error-annotation.scala renamed to tests/vulpix-tests/meta/neg/missing-error-annotation.scala

@@ -1,7 +1,7 @@
 [info] Test run started
 [info] Test dotty.tools.vulpix.VulpixMetaTests.runAll started
-Testing ../tests/meta-tests/run/wrong-check-file.scala
-Output from '../tests/meta-tests/run/wrong-check-file.scala' did not match check file.
+Testing ../tests/vulpix-tests/meta/run/wrong-check-file.scala
+Output from '../tests/vulpix-tests/meta/run/wrong-check-file.scala' did not match check file.
 Diff (expected on the left, actual right):
 hello  |  world
 world  |  hello
@@ -13,7 +13,7 @@ Diff (expected on the left, actual right):
 [error]     at dotty.tools.vulpix.VulpixMetaTests.runAll(VulpixMetaTests.scala:26)
 [error]     ...
 [info] Test dotty.tools.vulpix.VulpixMetaTests.compileNeg started
-Testing ../tests/meta-tests/neg/missing-error-annotation.scala
+Testing ../tests/vulpix-tests/meta/neg/missing-error-annotation.scala
 
 Wrong number of errors encountered when compiling ../out/VulpixMetaTests/neg/missing-error-annotation, expected: 0, actual: 2
 
@@ -24,8 +24,8 @@ Wrong number of errors encountered when compiling ../out/VulpixMetaTests/neg/mis
 [error]     at dotty.tools.vulpix.VulpixMetaTests.compileNeg(VulpixMetaTests.scala:25)
 [error]     ...
 [info] Test dotty.tools.vulpix.VulpixMetaTests.compilePos started
-Testing ../tests/meta-tests/pos/does-not-compile.scala
--- [E006] Unbound Identifier Error: /home/olivier/workspace/dotty/compiler/../tests/meta-tests/pos/does-not-compile.scala:2:2 SKIP
+Testing ../tests/vulpix-tests/meta/pos/does-not-compile.scala
+-- [E006] Unbound Identifier Error: /home/olivier/workspace/dotty/compiler/../tests/vulpix-tests/meta/pos/does-not-compile.scala:2:2 SKIP
 2 |  a // Does not compile
   |  ^
   |  not found: a