diff options
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 40325c6375..f2128cc219 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -692,7 +692,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor // create proper settings for the compiler val settings = new Settings(workerError) settings.outdir.value = outDir.getAbsoluteFile.getAbsolutePath - settings.sourcepath.value = sourcepath + settings.Ysourcepath.value = sourcepath settings.classpath.value = fileManager.CLASSPATH settings.Ybuildmanagerdebug.value = true @@ -710,7 +710,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor val args = (line split ' ').toList val command = new CompilerCommand(args, settings) command.ok && { - bM.update(filesToSet(settings.sourcepath.value, command.files), Set.empty) + bM.update(filesToSet(settings.Ysourcepath.value, command.files), Set.empty) !reporter.hasErrors } } @@ -797,7 +797,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor NestUI.verbose("resFile: "+resFile) // run compiler in resident mode - // $SCALAC -d "$os_dstbase".obj -Xresident -sourcepath . "$@" + // $SCALAC -d "$os_dstbase".obj -Xresident -Ysourcepath . "$@" val sourcedir = logFile.getParentFile.getAbsoluteFile val sourcepath = sourcedir.getAbsolutePath+File.separator NestUI.verbose("sourcepath: "+sourcepath) @@ -805,7 +805,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor val argList = List( "-d", outDir.getAbsoluteFile.getPath, "-Xresident", - "-sourcepath", sourcepath) + "-Ysourcepath", sourcepath) // configure input/output files val logOut = new FileOutputStream(logFile) @@ -815,7 +815,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor // create compiler val settings = new Settings(workerError) - settings.sourcepath.value = sourcepath + settings.Ysourcepath.value = sourcepath settings.classpath.value = fileManager.CLASSPATH reporter = new ConsoleReporter(settings, scala.Console.in, logConsoleWriter) val command = new CompilerCommand(argList, settings) @@ -826,7 +826,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor val cmdArgs = (line split ' ').toList map (fs => new File(dir, fs).getAbsolutePath) NestUI.verbose("cmdArgs: "+cmdArgs) val sett = new Settings(workerError) - sett.sourcepath.value = sourcepath + sett.Ysourcepath.value = sourcepath val command = new CompilerCommand(cmdArgs, sett) command.ok && { (new compiler.Run) compile command.files |