diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2019-06-17 02:01:03 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2019-06-17 02:01:03 -0700 |
commit | 8efa01a8c30c539c8c720cae0687ca88083d7c58 (patch) | |
tree | 144fae1e09ab8e2f971322d3beeda9e7c059a6ed | |
parent | 026e6ffb0e8e4a14e27dd2519e05fadbbf1d119a (diff) | |
download | mill-8efa01a8c30c539c8c720cae0687ca88083d7c58.tar.gz mill-8efa01a8c30c539c8c720cae0687ca88083d7c58.tar.bz2 mill-8efa01a8c30c539c8c720cae0687ca88083d7c58.zip |
remove 2.11 tests
-rw-r--r-- | scalajslib/test/src/HelloJSWorldTests.scala | 10 | ||||
-rw-r--r-- | scalalib/test/src/HelloJavaTests.scala | 2 | ||||
-rw-r--r-- | scalalib/test/src/HelloWorldTests.scala | 1 | ||||
-rw-r--r-- | scalanativelib/test/src/HelloNativeWorldTests.scala | 4 |
4 files changed, 4 insertions, 13 deletions
diff --git a/scalajslib/test/src/HelloJSWorldTests.scala b/scalajslib/test/src/HelloJSWorldTests.scala index af7ae051..be8967c7 100644 --- a/scalajslib/test/src/HelloJSWorldTests.scala +++ b/scalajslib/test/src/HelloJSWorldTests.scala @@ -100,7 +100,6 @@ object HelloJSWorldTests extends TestSuite { test("fromScratch_2124_0622") - testCompileFromScratch("2.12.4", "0.6.22") test("fromScratch_2123_0622") - testCompileFromScratch("2.12.3", "0.6.22") - test("fromScratch_2118_0622") - TestUtil.disableInJava9OrAbove(testCompileFromScratch("2.11.8", "0.6.22")) test("fromScratch_2124_100M2") - testCompileFromScratch("2.12.4", "1.0.0-M2") } @@ -119,13 +118,11 @@ object HelloJSWorldTests extends TestSuite { test("fullOpt"){ test("run_2124_0622") - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FullOpt)) test("run_2123_0622") - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FullOpt)) - test("run_2118_0622") - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FullOpt)) test("run_2124_100M2") - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FullOpt)) } test("fastOpt"){ test("run_2124_0622") - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "0.6.22", FastOpt)) test("run_2123_0622") - TestUtil.disableInJava9OrAbove(testRun("2.12.3", "0.6.22", FastOpt)) - test("run_2118_0622") - TestUtil.disableInJava9OrAbove(testRun("2.11.8", "0.6.22", FastOpt)) test("run_2124_100M2") - TestUtil.disableInJava9OrAbove(testRun("2.12.4", "1.0.0-M2", FastOpt)) } test("jar"){ @@ -190,12 +187,9 @@ object HelloJSWorldTests extends TestSuite { ) } - test("utest_2118_0622") - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "0.6.22")) test("utest_2124_0622") - checkUtest("2.12.4", "0.6.22") - test("utest_2118_100M2") - TestUtil.disableInJava9OrAbove(checkUtest("2.11.8", "1.0.0-M2")) test("utest_2124_100M2") - checkUtest("2.12.4", "1.0.0-M2") - test("scalaTest_2118_0622") - TestUtil.disableInJava9OrAbove(checkScalaTest("2.11.8", "0.6.22")) test("scalaTest_2124_0622") - checkScalaTest("2.12.4", "0.6.22") // No scalatest artifact for scala.js 1.0.0-M2 published yet // test("scalaTest_2118_100M2") - checkScalaTest("2.11.8", "1.0.0-M2") @@ -220,9 +214,7 @@ object HelloJSWorldTests extends TestSuite { } test("run"){ - 'run_2118_0622 - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "0.6.22")) - 'run_2124_0622 - checkRun("2.12.4", "0.6.22") - test("run_2118_100M2") - TestUtil.disableInJava9OrAbove(checkRun("2.11.8", "1.0.0-M2")) + test("run_2124_0622") - checkRun("2.12.4", "0.6.22") test("run_2124_100M2") - checkRun("2.12.4", "1.0.0-M2") } } diff --git a/scalalib/test/src/HelloJavaTests.scala b/scalalib/test/src/HelloJavaTests.scala index 66511ad8..b692beeb 100644 --- a/scalalib/test/src/HelloJavaTests.scala +++ b/scalalib/test/src/HelloJavaTests.scala @@ -53,7 +53,7 @@ object HelloJavaTests extends TestSuite { !os.walk(res3.classes.path).exists(_.last == "Core.class") ) } - 'docJar - { + test("docJar"){ val eval = init() val Right((ref1, _)) = eval.apply(HelloJava.core.docJar) diff --git a/scalalib/test/src/HelloWorldTests.scala b/scalalib/test/src/HelloWorldTests.scala index 80f78fe7..3b6ab999 100644 --- a/scalalib/test/src/HelloWorldTests.scala +++ b/scalalib/test/src/HelloWorldTests.scala @@ -513,7 +513,6 @@ object HelloWorldTests extends TestSuite { ) } test("v210") - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.10.6", "2.10.6 rox"))) - test("v211") - TestUtil.disableInJava9OrAbove(workspaceTest(CrossHelloWorld)(cross(_, "2.11.11", "2.11.11 pwns"))) test("v2123") - workspaceTest(CrossHelloWorld)(cross(_, "2.12.3", "2.12.3 leet")) test("v2124") - workspaceTest(CrossHelloWorld)(cross(_, "2.12.4", "2.12.4 leet")) test("v2130M3") - workspaceTest(CrossHelloWorld)(cross(_, "2.13.0-M3", "2.13.0-M3 idk")) diff --git a/scalanativelib/test/src/HelloNativeWorldTests.scala b/scalanativelib/test/src/HelloNativeWorldTests.scala index 1ba751b3..cfc6c5f3 100644 --- a/scalanativelib/test/src/HelloNativeWorldTests.scala +++ b/scalanativelib/test/src/HelloNativeWorldTests.scala @@ -192,8 +192,8 @@ object HelloNativeWorldTests extends TestSuite { } test("run"){ - 'run_21112_038_debug - (checkRun("2.11.12", "0.3.8", ReleaseMode.Debug)) - 'run_21112_038_release - (checkRun("2.11.12", "0.3.8", ReleaseMode.Release)) + test("run_21112_038_debug") - (checkRun("2.11.12", "0.3.8", ReleaseMode.Debug)) + test("run_21112_038_release") - (checkRun("2.11.12", "0.3.8", ReleaseMode.Release)) } } |