diff options
| author | Vlad Ureche <vlad.ureche@epfl.ch> | 2011-12-16 21:18:38 +0100 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-12-16 14:18:03 -0800 |
| commit | 98108febce145b9f2842937d3ac4a9c1d24f6108 (patch) | |
| tree | 31921e3138525876412539bf5dd47a4d3751c608 /src/partest | |
| parent | 2f5f7c16870ae1fa97bbca1642659ab8c104b442 (diff) | |
| download | scala-98108febce145b9f2842937d3ac4a9c1d24f6108.tar.gz scala-98108febce145b9f2842937d3ac4a9c1d24f6108.tar.bz2 scala-98108febce145b9f2842937d3ac4a9c1d24f6108.zip | |
Fixed "Definition Classes" in bug #5287
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/CompileManager.scala | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index f4ebfb7e7d..68688ff949 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -75,7 +75,8 @@ class DirectCompiler(val fileManager: FileManager) extends SimpleCompiler { val logWriter = new FileWriter(log) // check whether there is a ".flags" file - val flagsFileName = "%s.flags" format (basename(log.getName) dropRight 4) // 4 is "-run" or similar + val logFile = basename(log.getName) + val flagsFileName = "%s.flags" format (logFile.substring(0, logFile.lastIndexOf("-"))) val argString = (io.File(log).parent / flagsFileName) ifFile (x => updatePluginPath(x.slurp())) getOrElse "" val allOpts = fileManager.SCALAC_OPTS.toList ::: argString.split(' ').toList.filter(_.length > 0) val args = allOpts.toList |