summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-05-12 06:46:53 +0000
committerPaul Phillips <paulp@improving.org>2011-05-12 06:46:53 +0000
commit692f32f66be2bba2cb860281ea2b63479fdb3a85 (patch)
tree63d5585bd51077a87fb3db51c78ae18b4f7f7d19 /src/partest
parent2bd6b4ae4010b3c65cb36d876c2ca94cb6d48b14 (diff)
downloadscala-692f32f66be2bba2cb860281ea2b63479fdb3a85.tar.gz
scala-692f32f66be2bba2cb860281ea2b63479fdb3a85.tar.bz2
scala-692f32f66be2bba2cb860281ea2b63479fdb3a85.zip
More optimization.
(e.g. getCanonicalFile) especially if it's running at startup. No review.
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/nest/FileManager.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/Worker.scala4
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 e23063640f..6cf0a9d94c 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.getCanonicalPath(), f2.getCanonicalPath())
+ val args = Array(f1.getPath(), f2.getPath())
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 bfa6427d21..b894d7086b 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.getCanonicalPath, TestState.Timeout)
+ updateStatus(file.getAbsolutePath, 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.getCanonicalPath, state)
+ updateStatus(file.getAbsolutePath, state)
reportResult(
state,
logs.file,