Skip to content

Commit 6115d66

Browse files
committed
Fixes to tests
1. I noted java_all was not running(it took 0.01s to complete); fixed by changing the test directory. 2. We suspected tasty_bootstrap was gettng the wrong classpath and had a lot of problems getting it to print the classpatg. Fixed by refactoring the options we pass to tasty_bootstrap (it has to be -verbose in addition to -classpath). For the moment, both a turned off but we have to just swap a false to a true to turn them on together.
1 parent 0f99712 commit 6115d66

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

compiler/test/dotc/tests.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ class tests extends CompilerTest {
8484
val runDir = testsDir + "run/"
8585
val newDir = testsDir + "new/"
8686
val replDir = testsDir + "repl/"
87+
val javaDir = testsDir + "pos-java-interop/"
8788

8889
val sourceDir = "./src/"
8990
val dottyDir = sourceDir + "dotty/"
@@ -260,7 +261,6 @@ class tests extends CompilerTest {
260261
dotcDir + "config/PathResolver.scala"
261262
), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice)
262263

263-
val javaDir = "./tests/pos-java-interop/"
264264
@Test def java_all = compileFiles(javaDir, twice)
265265
//@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand")
266266

@@ -349,9 +349,10 @@ class tests extends CompilerTest {
349349
@Test def tasty_tests = compileDir(testsDir, "tasty", testPickling)
350350

351351
@Test def tasty_bootstrap = {
352-
val opt = List("-priorityclasspath", defaultOutputDir, "-Ylog-classpath")
352+
val logging = if (false) List("-Ylog-classpath", "-verbose") else Nil
353+
val opt = List("-priorityclasspath", defaultOutputDir) ++ logging
353354
// first compile dotty
354-
compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes)
355+
compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict") ++ logging)(allowDeepSubtypes)
355356

356357
compileDir(libDir, "dotty", "-deep" :: opt)
357358
compileDir(libDir, "scala", "-deep" :: opt)

0 commit comments

Comments
 (0)