Skip to content

Commit 7639214

Browse files
committed
Compress the blacklist of Scala.js tests.
We do not decompose by subdirectory anymore. This makes the list shorter, and also makes sure that we do not forget top-level directories.
1 parent 9bdcdbe commit 7639214

File tree

1 file changed

+1
-13
lines changed

1 file changed

+1
-13
lines changed

project/Build.scala

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1039,26 +1039,14 @@ object Build {
10391039
++ (dir / "shared/src/test/require-sam" ** "*.scala").get
10401040
++ (dir / "shared/src/test/require-jdk8" ** "*.scala").get
10411041
++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get
1042-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/compiler" ** "*.scala").get
1043-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/javalib" ** "*.scala").get
10441042

1045-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/jsinterop" ** (("*.scala": FileFilter)
1043+
++ (dir / "js/src/test/scala" ** (("*.scala": FileFilter)
10461044
-- "ExportsTest.scala" // JS exports + do not compile because of a var in a structural type
1047-
)).get
1048-
1049-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/junit" ** "*.scala").get
1050-
1051-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/library" ** (("*.scala": FileFilter)
10521045
-- "ObjectTest.scala" // compile errors caused by #9588
10531046
-- "StackTraceTest.scala" // would require `npm install source-map-support`
10541047
-- "UnionTypeTest.scala" // requires the Scala 2 macro defined in Typechecking*.scala
10551048
)).get
10561049

1057-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/niobuffer" ** "*.scala").get
1058-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/scalalib" ** "*.scala").get
1059-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/typedarray" ** "*.scala").get
1060-
++ (dir / "js/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get
1061-
10621050
++ (dir / "js/src/test/require-2.12" ** "*.scala").get
10631051
++ (dir / "js/src/test/require-sam" ** "*.scala").get
10641052
++ (dir / "js/src/test/scala-new-collections" ** "*.scala").get

0 commit comments

Comments
 (0)