Skip to content

Commit c54173f

Browse files
committed
Avoid running sepparate compilation tests under legacy tests
Those tests have never fully been supported, all files are compiled at the same time.
1 parent 1e8c8a6 commit c54173f

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

compiler/test/dotty/tools/dotc/CompilerTest.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,12 @@ abstract class CompilerTest {
109109
if (runTest)
110110
log(s"WARNING: run tests can only be run by partest, JUnit just verifies compilation: $prefix$dirName")
111111
val (filePaths, javaFilePaths, normArgs, expErrors) = computeFilePathsAndExpErrors
112-
compileWithJavac(javaFilePaths, Array.empty) // javac needs to run first on dotty-library
113-
compileArgs(javaFilePaths ++ filePaths ++ normArgs, expErrors)
112+
if (filePaths.exists(_.endsWith("_1.scala"))) {
113+
log(s"WARNING: separate compilation test can not be run as legacy test: $prefix$dirName")
114+
} else {
115+
compileWithJavac(javaFilePaths, Array.empty) // javac needs to run first on dotty-library
116+
compileArgs(javaFilePaths ++ filePaths ++ normArgs, expErrors)
117+
}
114118
}
115119
def runDir(prefix: String, dirName: String, args: List[String] = Nil)
116120
(implicit defaultOptions: List[String]): Unit =

0 commit comments

Comments
 (0)