diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-05-07 15:30:46 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2010-05-07 15:30:46 +0000 |
commit | d1185713fa066528eac5f228aae943dd5ad3a142 (patch) | |
tree | 15aa624ba07dac1cd0ca0c7bedbff2bdbd7ae9aa /src | |
parent | 536fa4d9c8f4ad70451909c39cdab13dd0ee4078 (diff) | |
download | scala-d1185713fa066528eac5f228aae943dd5ad3a142.tar.gz scala-d1185713fa066528eac5f228aae943dd5ad3a142.tar.bz2 scala-d1185713fa066528eac5f228aae943dd5ad3a142.zip |
Remove the sourcepath prefix from the logs and ...
Remove the sourcepath prefix from the logs and only then do dos2unix
paths changing (otherwise #3054 fails). It is a bit ugly but it is only
done for buildmanager (paul was doing it anyway in his reverted partes).
That should really fix the windows build. No review.
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala | 7 | ||||
-rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 4 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala index 52135ebcd6..7c977c6e60 100644 --- a/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala +++ b/src/compiler/scala/tools/nsc/interactive/RefinedBuildManager.scala @@ -111,11 +111,8 @@ class RefinedBuildManager(val settings: Settings) extends Changes with BuildMana (from.hasFlag(Flags.MODULE) == to.hasFlag(Flags.MODULE)) // For testing purposes only, order irrelevant for compilation - def toStringSet(set: Set[AbstractFile]): String = { - val s = set.toList sortBy (_.name) map - (_.toString.replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/")) - s.mkString("Set(", ", ", ")") - } + def toStringSet(set: Set[AbstractFile]): String = + set.toList sortBy (_.name) mkString("Set(", ", ", ")") def update0(files: Set[AbstractFile]): Unit = if (!files.isEmpty) { deleteClassfiles(files) diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 45fa5e2020..7797c1095a 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -614,8 +614,8 @@ class Worker(val fileManager: FileManager) extends Actor { loop() testReader.close() } - val unixsrcpath = sourcepath.replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/") - fileManager.mapFile(logFile, "tmp", file, _.replace(unixsrcpath, "")) + fileManager.mapFile(logFile, "tmp", file, _.replace(sourcepath, ""). + replaceAll(java.util.regex.Matcher.quoteReplacement("\\"), "/")) diffCheck(compareOutput(file, fileBase, kind, logFile)) } |