summaryrefslogtreecommitdiff
path: root/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
diff options
context:
space:
mode:
Diffstat (limited to 'scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala')
-rw-r--r--scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala28
1 files changed, 14 insertions, 14 deletions
diff --git a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
index 2429a189..cfdcdd1f 100644
--- a/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
+++ b/scalajslib/test/src/mill/scalajslib/HelloJSWorldTests.scala
@@ -102,7 +102,7 @@ object HelloJSWorldTests extends TestSuite {
'fromScratch_2124_0622 - testCompileFromScratch("2.12.4", "0.6.22")
'fromScratch_2123_0622 - testCompileFromScratch("2.12.3", "0.6.22")
- 'fromScratch_2118_0622 - testCompileFromScratch("2.11.8", "0.6.22")
+ 'fromScratch_2118_0622 - TestUtil.disableInJava9OrAbove(testCompileFromScratch("2.11.8", "0.6.22"))
'fromScratch_2124_100M2 - testCompileFromScratch("2.12.4", "1.0.0-M2")
}
@@ -119,16 +119,16 @@ object HelloJSWorldTests extends TestSuite {
}
'fullOpt - {
- 'run_2124_0622 - testRun("2.12.4", "0.6.22", FullOpt)
- 'run_2123_0622 - testRun("2.12.3", "0.6.22", FullOpt)
- 'run_2118_0622 - testRun("2.11.8", "0.6.22", FullOpt)
- 'run_2124_100M2 - testRun("2.12.4", "1.0.0-M2", FullOpt)
+ 'run_2124_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FullOpt))
+ 'run_2123_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FullOpt))
+ 'run_2118_0622 - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FullOpt))
+ 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FullOpt))
}
'fastOpt - {
- 'run_2124_0622 - testRun("2.12.4", "0.6.22", FastOpt)
- 'run_2123_0622 - testRun("2.12.3", "0.6.22", FastOpt)
- 'run_2118_0622 - testRun("2.11.8", "0.6.22", FastOpt)
- 'run_2124_100M2 - testRun("2.12.4", "1.0.0-M2", FastOpt)
+ 'run_2124_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FastOpt))
+ 'run_2123_0622 - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FastOpt))
+ 'run_2118_0622 - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FastOpt))
+ 'run_2124_100M2 - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FastOpt))
}
'jar - {
'containsSJSIRs - {
@@ -192,12 +192,12 @@ object HelloJSWorldTests extends TestSuite {
)
}
- 'utest_2118_0622 - checkUtest("2.11.8", "0.6.22")
+ 'utest_2118_0622 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "0.6.22"))
'utest_2124_0622 - checkUtest("2.12.4", "0.6.22")
- 'utest_2118_100M2 - checkUtest("2.11.8", "1.0.0-M2")
+ 'utest_2118_100M2 - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "1.0.0-M2"))
'utest_2124_100M2 - checkUtest("2.12.4", "1.0.0-M2")
- 'scalaTest_2118_0622 - checkScalaTest("2.11.8", "0.6.22")
+ 'scalaTest_2118_0622 - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.8", "0.6.22"))
'scalaTest_2124_0622 - checkScalaTest("2.12.4", "0.6.22")
// No scalatest artifact for scala.js 1.0.0-M2 published yet
// 'scalaTest_2118_100M2 - checkScalaTest("2.11.8", "1.0.0-M2")
@@ -222,9 +222,9 @@ object HelloJSWorldTests extends TestSuite {
}
'run - {
- 'run_2118_0622 - checkRun("2.11.8", "0.6.22")
+ 'run_2118_0622 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "0.6.22"))
'run_2124_0622 - checkRun("2.12.4", "0.6.22")
- 'run_2118_100M2 - checkRun("2.11.8", "1.0.0-M2")
+ 'run_2118_100M2 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "1.0.0-M2"))
'run_2124_100M2 - checkRun("2.12.4", "1.0.0-M2")
}
}