diff options
| -rw-r--r-- | project/Build.scala | 4 | ||||
| -rw-r--r-- | test/dotc/tests.scala | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/project/Build.scala b/project/Build.scala index d21b4c807..504185e65 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -167,8 +167,8 @@ object DottyBuild extends Build { // Partest tasks lazy val lockPartestFile = TaskKey[Unit]("lockPartestFile", "Creates the lock file at ./tests/locks/partest-<pid>.lock") - val partestLockFile = new File("." + File.separator + "tests" + File.separator + "locks" + File.separator + s"partest-$pid.lock") - val pid = java.lang.Long.parseLong(java.lang.management.ManagementFactory.getRuntimeMXBean().getName().split("@")(0)) + lazy val partestLockFile = new File("." + File.separator + "tests" + File.separator + "locks" + File.separator + s"partest-$pid.lock") + def pid = java.lang.Long.parseLong(java.lang.management.ManagementFactory.getRuntimeMXBean().getName().split("@")(0)) lazy val runPartestRunner = TaskKey[Unit]("runPartestRunner", "Runs partest") diff --git a/test/dotc/tests.scala b/test/dotc/tests.scala index 04ea1c3ef..88d076fd3 100644 --- a/test/dotc/tests.scala +++ b/test/dotc/tests.scala @@ -45,7 +45,8 @@ class tests extends CompilerTest { val coreDir = dotcDir + "core/" @Test def pickle_pickleOK = compileDir(testsDir, "pickling", testPickling) - @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) +// This directory doesn't exist anymore +// @Test def pickle_pickling = compileDir(coreDir, "pickling", testPickling) @Test def pickle_ast = compileDir(dotcDir, "ast", testPickling) //@Test def pickle_core = compileDir(dotcDir, "core", testPickling, xerrors = 2) // two spurious comparison errors in Types and TypeOps @@ -148,8 +149,8 @@ class tests extends CompilerTest { @Test def dotc_config = compileDir(dotcDir, "config") @Test def dotc_core = compileDir(dotcDir, "core")("-Yno-double-bindings" :: allowDeepSubtypes)// twice omitted to make tests run faster - - @Test def dotc_core_pickling = compileDir(coreDir, "pickling")(allowDeepSubtypes)// twice omitted to make tests run faster +// This directory doesn't exist anymore +// @Test def dotc_core_pickling = compileDir(coreDir, "pickling")(allowDeepSubtypes)// twice omitted to make tests run faster @Test def dotc_transform = compileDir(dotcDir, "transform")// twice omitted to make tests run faster |