From dc291f350cd2641b5ca41395e8ecf2b1f156d6d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Doeraene?= Date: Mon, 24 Aug 2020 15:11:51 +0200 Subject: [PATCH] Scala.js: Enable more shared tests that pass. --- project/Build.scala | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 039f12b6e6d1..feb14165f090 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1020,47 +1020,29 @@ object Build { managedSources in Test ++= { val dir = fetchScalaJSSource.value / "test-suite" ( - (dir / "shared/src/test/scala/org/scalajs/testsuite/compiler" ** (("*.scala":FileFilter) -- "RegressionTest.scala" -- "ReflectiveCallTest.scala")).get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/lang" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/io" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/math" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/net" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/security" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util/regex" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util/concurrent" ** "*.scala").get - - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util" * (("*.scala": FileFilter) - -- "AbstractSetTest.scala" + (dir / "shared/src/test/scala" ** (("*.scala": FileFilter) + -- "RegressionTest.scala" // IR checking errors + -- "ReflectiveCallTest.scala" // uses many forms of structural calls that are not allowed in Scala 3 anymore + -- "EnumerationTest.scala" // scala.Enumeration support for Scala.js is not implemented in dotc (yet) + -- "SymbolTest.scala" // uses the old literal symbol syntax, pending update upstream + + // all the following depend on HashSetTest and LinkedHashSetTest ... -- "CollectionsOnCheckedCollectionTest.scala" -- "CollectionsOnCheckedListTest.scala" - -- "CollectionsOnCheckedMapTest.scala" -- "CollectionsOnCheckedSetTest.scala" - -- "CollectionsOnListsTest.scala" - -- "CollectionsOnMapsTest.scala" - -- "CollectionsOnSetFromMapTest.scala" -- "CollectionsOnSetsTest.scala" -- "CollectionsOnSynchronizedCollectionTest.scala" -- "CollectionsOnSynchronizedListTest.scala" - -- "CollectionsOnSynchronizedMapTest.scala" -- "CollectionsOnSynchronizedSetTest.scala" + + // ... which do not compile because of an abstract method shadowing a concrete method, pending update upstream -- "HashSetTest.scala" -- "LinkedHashSetTest.scala" - -- "SortedSetTest.scala" - -- "TreeSetTest.scala" )).get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/junit" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/niobuffer" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/niocharset" ** "*.scala").get - ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/scalalib" ** (("*.scala": FileFilter) -- "EnumerationTest.scala" -- "SymbolTest.scala")).get ++ (dir / "shared/src/test/require-sam" ** "*.scala").get - ++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/compiler" ** "*.scala").get - ++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/lang" ** "*.scala").get - ++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/util" ** (("*.scala": FileFilter) -- "CollectionsOnCopyOnWriteArrayListTestOnJDK8.scala")).get - ++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/io" ** "*.scala").get - ++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/lang" ** "*.scala").get - ++ (dir / "shared/src/test/require-jdk7/org/scalajs/testsuite/javalib/util" ** "*.scala").get + ++ (dir / "shared/src/test/require-jdk8" ** "*.scala").get + ++ (dir / "shared/src/test/require-jdk7" ** "*.scala").get ++ (dir / "js/src/test/scala/org/scalajs/testsuite/compiler" ** (("*.scala": FileFilter) -- "InteroperabilityTest.scala" // various compile errors, pending update upstream