diff options
| author | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-18 10:54:49 -0500 |
|---|---|---|
| committer | Josh Suereth <joshua.suereth@gmail.com> | 2011-12-18 10:54:49 -0500 |
| commit | 56a366c854457f842522a481701be2f1f1b318c7 (patch) | |
| tree | 3819bdcfe76a07be7027694299f86d7ec7aad5d4 /src/partest | |
| parent | 971536593f33f357356b4c58d8a66742755801b8 (diff) | |
| parent | a332a39d316f0223f00a31999b76a369f9e6fee4 (diff) | |
| download | scala-56a366c854457f842522a481701be2f1f1b318c7.tar.gz scala-56a366c854457f842522a481701be2f1f1b318c7.tar.bz2 scala-56a366c854457f842522a481701be2f1f1b318c7.zip | |
Merge branch 'master' into xsbt
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 |