diff options
Diffstat (limited to 'src/partest')
-rw-r--r-- | src/partest/scala/tools/partest/CompilerTest.scala | 2 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/DirectTest.scala | 2 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/PathSettings.scala | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/CompilerTest.scala b/src/partest/scala/tools/partest/CompilerTest.scala index dd06c051a4..1cb09b433a 100644 --- a/src/partest/scala/tools/partest/CompilerTest.scala +++ b/src/partest/scala/tools/partest/CompilerTest.scala @@ -19,7 +19,7 @@ abstract class CompilerTest extends DirectTest { lazy val global: Global = newCompiler() lazy val units = compilationUnits(global)(sources: _ *) - + override def extraSettings = "-usejavacp -d " + testOutput.path def sources: List[String] = List(code) diff --git a/src/partest/scala/tools/partest/DirectTest.scala b/src/partest/scala/tools/partest/DirectTest.scala index 74f511aa4e..07444f8d4b 100644 --- a/src/partest/scala/tools/partest/DirectTest.scala +++ b/src/partest/scala/tools/partest/DirectTest.scala @@ -63,7 +63,7 @@ abstract class DirectTest extends App { global.reporter.reset() f(new global.Run) } - + // compile the code, optionally first adding to the settings def compile(args: String*) = compileString(newCompiler(args: _*))(code) diff --git a/src/partest/scala/tools/partest/nest/PathSettings.scala b/src/partest/scala/tools/partest/nest/PathSettings.scala index 4fe337b19f..ac04c64c33 100644 --- a/src/partest/scala/tools/partest/nest/PathSettings.scala +++ b/src/partest/scala/tools/partest/nest/PathSettings.scala @@ -44,7 +44,7 @@ object PathSettings { lazy val srcCodeLibDir = Directory(srcDir / "codelib") lazy val srcCodeLib: File = ( - findJar(srcCodeLibDir, "code") + findJar(srcCodeLibDir, "code") orElse findJar(Directory(testRoot / "files" / "codelib"), "code") // work with --srcpath pending getOrElse sys.error("No code.jar found in %s".format(srcCodeLibDir)) ) |