summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-05-07 15:30:46 +0000
committerHubert Plociniczak <hubert.plociniczak@epfl.ch>2010-05-07 15:30:46 +0000
commitd1185713fa066528eac5f228aae943dd5ad3a142 (patch)
tree15aa624ba07dac1cd0ca0c7bedbff2bdbd7ae9aa /src/partest
parent536fa4d9c8f4ad70451909c39cdab13dd0ee4078 (diff)
downloadscala-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/partest')
-rw-r--r--src/partest/scala/tools/partest/nest/Worker.scala4
1 files changed, 2 insertions, 2 deletions
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))
}