Merge pull request scala#2099 from retronym/ticket/6158

paulp · paulp · commit b3b49d2217f2 · 2013-02-11T07:47:14.000-08:00
SI-6158 Restore compile error output under partest --show-log
diff --git 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)
         }
       }

Original file line number	Diff line number	Diff line change
`@@ -817,7 +817,7 @@ class RunnerManager(kind: String, val fileManager: FileManager, params: TestRunP`
`817`	`817`	`if (passed exists (x => !x)) {`
`818`	`818`	`if (fileManager.showDiff \|\| isPartestDebug)`
`819`	`819`	`NestUI.normal(testDiff)`
`820`		`- else if (fileManager.showLog)`
	`820`	`+ if (fileManager.showLog)`
`821`	`821`	`showLog(logFile)`
`822`	`822`	`}`
`823`	`823`	`}`