diff options
-rw-r--r-- | test/dotc/tests.scala | 7 | ||||
-rw-r--r-- | test/test/CompilerTest.scala | 6 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t1751/A1_2.scala (renamed from tests/disabled/java-interop/pos/t1751/A1_2.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t1751/A2_1.scala (renamed from tests/disabled/java-interop/pos/t1751/A2_1.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t1751/SuiteClasses.java (renamed from tests/disabled/java-interop/pos/t1751/SuiteClasses.java) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t2409/J.java (renamed from tests/disabled/java-interop/pos/t2409/J.java) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t2409/t2409.scala (renamed from tests/disabled/java-interop/pos/t2409/t2409.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t294/Ann.java (renamed from tests/disabled/java-interop/pos/t294/Ann.java) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t294/Ann2.java (renamed from tests/disabled/java-interop/pos/t294/Ann2.java) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t294/Test_1.scala (renamed from tests/disabled/java-interop/pos/t294/Test_1.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/failing/t294/Test_2.scala (renamed from tests/disabled/java-interop/pos/t294/Test_2.scala) | 0 | ||||
-rw-r--r-- | tests/disabled/java-interop/pos/t1782/Test_1.scala | 2 |
12 files changed, 11 insertions, 4 deletions
diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 8553ecb29..3f1801a50 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -137,5 +137,12 @@ class tests extends CompilerTest { "-Xprompt", "#runs", "2")) + val javaDir = "./tests/disabled/java-interop/" + @Test def java_all = compileFiles(javaDir+"pos/") + + @Test def java_2409 = compileDir(javaDir+"failing/t2409") + @Test def java_1751 = compileDir(javaDir+"failing/t1751") + @Test def java_294 = compileDir(javaDir+"failing/t294") + //@Test def dotc_compilercommand = compileFile(dotcDir + "tools/dotc/config/", "CompilerCommand") } diff --git a/test/test/CompilerTest.scala b/test/test/CompilerTest.scala index c9c7c602b..ccee7467f 100644 --- a/test/test/CompilerTest.scala +++ b/test/test/CompilerTest.scala @@ -28,13 +28,13 @@ class CompilerTest extends DottyTest { case "-deep" :: args1 => (dir.deepFiles, args1) case _ => (dir.files, args) } - val fileNames = files.toArray.map(_.toString).filter(_ endsWith ".scala") + val fileNames = files.toArray.map(_.toString).filter(name => (name endsWith ".scala") || (name endsWith ".java")) compileArgs(fileNames ++ normArgs, xerrors) } def compileFiles(path: String, args: List[String] = Nil)(implicit defaultOptions: List[String]): Unit = { val dir = Directory(path) - val fileNames = dir.files.toArray.map(_.toString).filter(_ endsWith ".scala") + val fileNames = dir.files.toArray.map(_.toString).filter(name => (name endsWith ".scala") || (name endsWith ".java")) for (name <- fileNames) { println(s"testing $name") compileArgs((name :: args).toArray, 0) @@ -57,4 +57,4 @@ object CompilerTest extends App { // new CompilerTest().compileDir(dotcDir + "tools/dotc") // new CompilerTest().compileFile(dotcDir + "tools/dotc/", "Run") -}
\ No newline at end of file +} diff --git a/tests/disabled/java-interop/pos/t1751/A1_2.scala b/tests/disabled/java-interop/failing/t1751/A1_2.scala index 354d5eecd..354d5eecd 100644 --- a/tests/disabled/java-interop/pos/t1751/A1_2.scala +++ b/tests/disabled/java-interop/failing/t1751/A1_2.scala diff --git a/tests/disabled/java-interop/pos/t1751/A2_1.scala b/tests/disabled/java-interop/failing/t1751/A2_1.scala index c768062e4..c768062e4 100644 --- a/tests/disabled/java-interop/pos/t1751/A2_1.scala +++ b/tests/disabled/java-interop/failing/t1751/A2_1.scala diff --git a/tests/disabled/java-interop/pos/t1751/SuiteClasses.java b/tests/disabled/java-interop/failing/t1751/SuiteClasses.java index a415e4f57..a415e4f57 100644 --- a/tests/disabled/java-interop/pos/t1751/SuiteClasses.java +++ b/tests/disabled/java-interop/failing/t1751/SuiteClasses.java diff --git a/tests/disabled/java-interop/pos/t2409/J.java b/tests/disabled/java-interop/failing/t2409/J.java index 6b7c45ff6..6b7c45ff6 100644 --- a/tests/disabled/java-interop/pos/t2409/J.java +++ b/tests/disabled/java-interop/failing/t2409/J.java diff --git a/tests/disabled/java-interop/pos/t2409/t2409.scala b/tests/disabled/java-interop/failing/t2409/t2409.scala index 0412f7d82..0412f7d82 100644 --- a/tests/disabled/java-interop/pos/t2409/t2409.scala +++ b/tests/disabled/java-interop/failing/t2409/t2409.scala diff --git a/tests/disabled/java-interop/pos/t294/Ann.java b/tests/disabled/java-interop/failing/t294/Ann.java index 934ca4629..934ca4629 100644 --- a/tests/disabled/java-interop/pos/t294/Ann.java +++ b/tests/disabled/java-interop/failing/t294/Ann.java diff --git a/tests/disabled/java-interop/pos/t294/Ann2.java b/tests/disabled/java-interop/failing/t294/Ann2.java index 025b79e79..025b79e79 100644 --- a/tests/disabled/java-interop/pos/t294/Ann2.java +++ b/tests/disabled/java-interop/failing/t294/Ann2.java diff --git a/tests/disabled/java-interop/pos/t294/Test_1.scala b/tests/disabled/java-interop/failing/t294/Test_1.scala index ff1f34b10..ff1f34b10 100644 --- a/tests/disabled/java-interop/pos/t294/Test_1.scala +++ b/tests/disabled/java-interop/failing/t294/Test_1.scala diff --git a/tests/disabled/java-interop/pos/t294/Test_2.scala b/tests/disabled/java-interop/failing/t294/Test_2.scala index 9fb1c6e17..9fb1c6e17 100644 --- a/tests/disabled/java-interop/pos/t294/Test_2.scala +++ b/tests/disabled/java-interop/failing/t294/Test_2.scala diff --git a/tests/disabled/java-interop/pos/t1782/Test_1.scala b/tests/disabled/java-interop/pos/t1782/Test_1.scala index 6467a74c2..47495c082 100644 --- a/tests/disabled/java-interop/pos/t1782/Test_1.scala +++ b/tests/disabled/java-interop/pos/t1782/Test_1.scala @@ -1,6 +1,6 @@ @ImplementedBy(classOf[Provider]) trait Service { - def someMethod() + def someMethod(): Unit } class Provider |