Skip to content

Commit 90720cf

Browse files
authored
Merge pull request #9627 from dotty-staging/sjs-enable-more-shared-tests
Scala.js: Enable all the remaining shared tests that pass.
2 parents a3e7636 + dc291f3 commit 90720cf

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

project/Build.scala

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,47 +1020,29 @@ object Build {
10201020
managedSources in Test ++= {
10211021
val dir = fetchScalaJSSource.value / "test-suite"
10221022
(
1023-
(dir / "shared/src/test/scala/org/scalajs/testsuite/compiler" ** (("*.scala":FileFilter) -- "RegressionTest.scala" -- "ReflectiveCallTest.scala")).get
1024-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/lang" ** "*.scala").get
1025-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/io" ** "*.scala").get
1026-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/math" ** "*.scala").get
1027-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/net" ** "*.scala").get
1028-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/security" ** "*.scala").get
1029-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util/regex" ** "*.scala").get
1030-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util/concurrent" ** "*.scala").get
1031-
1032-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util" * (("*.scala": FileFilter)
1033-
-- "AbstractSetTest.scala"
1023+
(dir / "shared/src/test/scala" ** (("*.scala": FileFilter)
1024+
-- "RegressionTest.scala" // IR checking errors
1025+
-- "ReflectiveCallTest.scala" // uses many forms of structural calls that are not allowed in Scala 3 anymore
1026+
-- "EnumerationTest.scala" // scala.Enumeration support for Scala.js is not implemented in dotc (yet)
1027+
-- "SymbolTest.scala" // uses the old literal symbol syntax, pending update upstream
1028+
1029+
// all the following depend on HashSetTest and LinkedHashSetTest ...
10341030
-- "CollectionsOnCheckedCollectionTest.scala"
10351031
-- "CollectionsOnCheckedListTest.scala"
1036-
-- "CollectionsOnCheckedMapTest.scala"
10371032
-- "CollectionsOnCheckedSetTest.scala"
1038-
-- "CollectionsOnListsTest.scala"
1039-
-- "CollectionsOnMapsTest.scala"
1040-
-- "CollectionsOnSetFromMapTest.scala"
10411033
-- "CollectionsOnSetsTest.scala"
10421034
-- "CollectionsOnSynchronizedCollectionTest.scala"
10431035
-- "CollectionsOnSynchronizedListTest.scala"
1044-
-- "CollectionsOnSynchronizedMapTest.scala"
10451036
-- "CollectionsOnSynchronizedSetTest.scala"
1037+
1038+
// ... which do not compile because of an abstract method shadowing a concrete method, pending update upstream
10461039
-- "HashSetTest.scala"
10471040
-- "LinkedHashSetTest.scala"
1048-
-- "SortedSetTest.scala"
1049-
-- "TreeSetTest.scala"
10501041
)).get
10511042

1052-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get
1053-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/junit" ** "*.scala").get
1054-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/niobuffer" ** "*.scala").get
1055-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/niocharset" ** "*.scala").get
1056-
++ (dir / "shared/src/test/scala/org/scalajs/testsuite/scalalib" ** (("*.scala": FileFilter) -- "EnumerationTest.scala" -- "SymbolTest.scala")).get
10571043
++ (dir / "shared/src/test/require-sam" ** "*.scala").get
1058-
++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/compiler" ** "*.scala").get
1059-
++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/lang" ** "*.scala").get
1060-
++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/util" ** (("*.scala": FileFilter) -- "CollectionsOnCopyOnWriteArrayListTestOnJDK8.scala")).get
1061-
++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/io" ** "*.scala").get
1062-
++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/lang" ** "*.scala").get
1063-
++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/util" ** "*.scala").get
1044+
++ (dir / "shared/src/test/require-jdk8" ** "*.scala").get
1045+
++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
10641046

10651047
++ (dir / "js/src/test/scala/org/scalajs/testsuite/compiler" ** (("*.scala": FileFilter)
10661048
-- "InteroperabilityTest.scala" // various compile errors, pending update upstream

0 commit comments

Comments
 (0)