From d1185713fa066528eac5f228aae943dd5ad3a142 Mon Sep 17 00:00:00 2001 From: Hubert Plociniczak Date: Fri, 7 May 2010 15:30:46 +0000 Subject: 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. --- src/partest/scala/tools/partest/nest/Worker.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/partest') 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)) } -- cgit v1.2.3