diff options
| author | Paul Phillips <paulp@improving.org> | 2011-05-12 07:48:28 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-05-12 07:48:28 +0000 |
| commit | 48e96634892328aa2c2cf4a85fd67edaa3e5aeed (patch) | |
| tree | 1081485986e10418ddcee70b977625743f210ff4 /src/partest | |
| parent | bf1da638ccae6fa494570441676193edb99ee882 (diff) | |
| download | scala-48e96634892328aa2c2cf4a85fd67edaa3e5aeed.tar.gz scala-48e96634892328aa2c2cf4a85fd67edaa3e5aeed.tar.bz2 scala-48e96634892328aa2c2cf4a85fd67edaa3e5aeed.zip | |
Reverting the rest of it until I can look with ...
Reverting the rest of it until I can look with clear eyes, no review.
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/FileManager.scala | 2 | ||||
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Worker.scala | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/partest/scala/tools/partest/nest/FileManager.scala b/src/partest/scala/tools/partest/nest/FileManager.scala index 6cf0a9d94c..e23063640f 100644 --- a/src/partest/scala/tools/partest/nest/FileManager.scala +++ b/src/partest/scala/tools/partest/nest/FileManager.scala @@ -27,7 +27,7 @@ trait FileManager { */ def compareFiles(f1: File, f2: File): String = { val diffWriter = new StringWriter - val args = Array(f1.getPath(), f2.getPath()) + val args = Array(f1.getCanonicalPath(), f2.getCanonicalPath()) DiffPrint.doDiff(args, diffWriter) val res = diffWriter.toString diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index b894d7086b..bfa6427d21 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -976,7 +976,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor react { case Timeout(file) => - updateStatus(file.getAbsolutePath, TestState.Timeout) + updateStatus(file.getCanonicalPath, TestState.Timeout) val swr = new StringWriter val wr = new PrintWriter(swr, true) printInfoStart(file, wr) @@ -988,7 +988,7 @@ class Worker(val fileManager: FileManager, params: TestRunParams) extends Actor case Result(file, logs) => val state = if (succeeded) TestState.Ok else TestState.Fail - updateStatus(file.getAbsolutePath, state) + updateStatus(file.getCanonicalPath, state) reportResult( state, logs.file, |