summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2013-02-11 07:47:14 -0800
committerPaul Phillips <paulp@improving.org>2013-02-11 07:47:14 -0800
commitb3b49d2217f21ce51eeed584f5bffb7febea5e50 (patch)
tree6de9e741025a4af67c04d98cdeded6e106b8c7bf /src/partest
parentdb5919a7d3b18be94e79899c2f7e33c535e15a27 (diff)
parent6424907ee45d2912adbd6ff27ff7aaeacd1704f5 (diff)
downloadscala-b3b49d2217f21ce51eeed584f5bffb7febea5e50.tar.gz
scala-b3b49d2217f21ce51eeed584f5bffb7febea5e50.tar.bz2
scala-b3b49d2217f21ce51eeed584f5bffb7febea5e50.zip
Merge pull request #2099 from retronym/ticket/6158
SI-6158 Restore compile error output under partest --show-log
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)
}
}