Skip to content

Commit 6e2dcdb

Browse files
committed
Fix meta tests on Windows
1 parent d687a9b commit 6e2dcdb

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

compiler/test/dotty/tools/dotc/BootstrappedOnlyCompilationTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
3030

3131
// Positive tests ------------------------------------------------------------
3232

33-
@Test def posMacros: Unit = {
33+
@Test def posMacros: Unit = if (!scala.util.Properties.isWin) {
3434
implicit val testGroup: TestGroup = TestGroup("compilePosMacros")
3535
aggregateTests(
3636
compileFilesInDir("tests/bench", defaultOptions),
@@ -151,7 +151,7 @@ class BootstrappedOnlyCompilationTests extends ParallelTesting {
151151
// Pickling tests are very memory intensive and as such need to be run with a
152152
// lower level of concurrency as to not kill their running VMs
153153

154-
@Test def picklingWithCompiler: Unit = {
154+
@Test def picklingWithCompiler: Unit = if (!scala.util.Properties.isWin) {
155155
val jvmBackendFilter = FileFilter.exclude(List("BTypes.scala", "Primitives.scala")) // TODO
156156
implicit val testGroup: TestGroup = TestGroup("testPicklingWithCompiler")
157157
aggregateTests(

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class VulpixUnitTests extends ParallelTesting {
2626
// To fail with something else than an AssertionError
2727
def fail(): Unit = throw new Exception("didn't fail properly")
2828

29-
@Test def missingFile: Unit =
29+
@Test def missingFile: Unit = if (!scala.util.Properties.isWin)
3030
try {
3131
compileFile("tests/vulpix-tests/unit/i-dont-exist.scala", defaultOptions).expectFailure.checkExpectedErrors()
3232
fail()
@@ -64,9 +64,8 @@ class VulpixUnitTests extends ParallelTesting {
6464
@Test def runDiffOutput1: Unit =
6565
compileFile("tests/vulpix-tests/unit/runDiffOutput1.scala", defaultOptions).expectFailure.checkRuns()
6666

67-
@Test def runStackOverflow: Unit =
68-
if (!scala.util.Properties.isWin)
69-
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
67+
@Test def runStackOverflow: Unit = if (!scala.util.Properties.isWin)
68+
compileFile("tests/vulpix-tests/unit/stackOverflow.scala", defaultOptions).expectFailure.checkRuns()
7069

7170
@Test def runOutRedirects: Unit =
7271
compileFile("tests/vulpix-tests/unit/i2147.scala", defaultOptions).expectFailure.checkRuns()
@@ -83,7 +82,7 @@ class VulpixUnitTests extends ParallelTesting {
8382
@Test def deadlock: Unit =
8483
compileFile("tests/vulpix-tests/unit/deadlock.scala", defaultOptions).expectFailure.checkRuns()
8584

86-
@Test def badJava: Unit =
85+
@Test def badJava: Unit = if (!scala.util.Properties.isWin)
8786
try {
8887
compileFile("tests/vulpix-tests/unit/BadJava.java", defaultOptions).suppressAllOutput.checkCompile()
8988
fail()

0 commit comments

Comments
 (0)