diff options
| author | Martin Odersky <odersky@gmail.com> | 2016-12-13 14:43:27 +0100 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2016-12-17 18:34:27 +0100 |
| commit | c9f666f7c21df45bf085ff2d6f6b0fbd7d01c72d (patch) | |
| tree | c3e52280fbc4533d193e7c7d90217151cff98299 /compiler/test | |
| parent | 6ce5fb1fa658de5b0509eade48c94e83534abab7 (diff) | |
| download | dotty-c9f666f7c21df45bf085ff2d6f6b0fbd7d01c72d.tar.gz dotty-c9f666f7c21df45bf085ff2d6f6b0fbd7d01c72d.tar.bz2 dotty-c9f666f7c21df45bf085ff2d6f6b0fbd7d01c72d.zip | |
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.
Diffstat (limited to 'compiler/test')
| -rw-r--r-- | compiler/test/dotc/tests.scala | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/compiler/test/dotc/tests.scala b/compiler/test/dotc/tests.scala index 827e1addd..f858926d5 100644 --- a/compiler/test/dotc/tests.scala +++ b/compiler/test/dotc/tests.scala @@ -84,6 +84,7 @@ class tests extends CompilerTest { val runDir = testsDir + "run/" val newDir = testsDir + "new/" val replDir = testsDir + "repl/" + val javaDir = testsDir + "pos-java-interop/" val sourceDir = "./src/" val dottyDir = sourceDir + "dotty/" @@ -260,7 +261,6 @@ class tests extends CompilerTest { dotcDir + "config/PathResolver.scala" ), List(/* "-Ylog:frontend", */ "-Xprompt") ++ staleSymbolError ++ twice) - val javaDir = "./tests/pos-java-interop/" @Test def java_all = compileFiles(javaDir, twice) //@Test def dotc_compilercommand = compileFile(dotcDir + "config/", "CompilerCommand") @@ -349,9 +349,10 @@ class tests extends CompilerTest { @Test def tasty_tests = compileDir(testsDir, "tasty", testPickling) @Test def tasty_bootstrap = { - val opt = List("-priorityclasspath", defaultOutputDir, "-Ylog-classpath") + val logging = if (false) List("-Ylog-classpath", "-verbose") else Nil + val opt = List("-priorityclasspath", defaultOutputDir) ++ logging // first compile dotty - compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict"))(allowDeepSubtypes) + compileDir(dottyDir, ".", List("-deep", "-Ycheck-reentrant", "-strict") ++ logging)(allowDeepSubtypes) compileDir(libDir, "dotty", "-deep" :: opt) compileDir(libDir, "scala", "-deep" :: opt) |