summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-02-09 00:15:09 +0100
committerJason Zaugg <jzaugg@gmail.com>2013-02-09 00:15:09 +0100
commit6424907ee45d2912adbd6ff27ff7aaeacd1704f5 (patch)
tree7c5a479acb64f44c89897b65952a5183e1f13100 /src/partest
parent6537d79e47def868e028815db6f70e2dc7d49bac (diff)
downloadscala-6424907ee45d2912adbd6ff27ff7aaeacd1704f5.tar.gz
scala-6424907ee45d2912adbd6ff27ff7aaeacd1704f5.tar.bz2
scala-6424907ee45d2912adbd6ff27ff7aaeacd1704f5.zip
SI-6158 Restore compile error output under partest --show-log
Seems like the ifs and elses didn't quite survive e830a7ce9. Before: ./test/partest --show-log test/files/run/foo.scala Testing individual files testing: [...]/files/run/foo.scala [FAILED] Now: ./test/partest --show-log test/files/run/foo.scala Testing individual files testing: [...]/files/run/foo.scala [FAILED] foo.scala:1: error: expected class or object definition askdfjskl ^ one error found 1 of 1 tests failed (elapsed time: 00:00:01)
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/nest/RunnerManager.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/partest/scala/tools/partest/nest/RunnerManager.scala b/src/partest/scala/tools/partest/nest/RunnerManager.scala
index c5e944fbc0..0d979d2692 100644
--- a/src/partest/scala/tools/partest/nest/RunnerManager.scala
+++ b/src/partest/scala/tools/partest/nest/RunnerManager.scala
@@ -817,7 +817,7 @@ class RunnerManager(kind: String, val fileManager: FileManager, params: TestRunP
if (passed exists (x => !x)) {
if (fileManager.showDiff || isPartestDebug)
NestUI.normal(testDiff)
- else if (fileManager.showLog)
+ if (fileManager.showLog)
showLog(logFile)
}
}