diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-12 16:06:19 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-02-12 16:06:19 -0800 |
| commit | 76f167388a42e9bb8b72645d87bcb408b6981576 (patch) | |
| tree | 55b62a8e1bf9d5bc908c757c2fe05e9f26ff1cf2 /src/partest | |
| parent | 14048023a1deba540502da96663deca6ca226bf6 (diff) | |
| parent | f51ed74aa3aa142c8aa9d5f9d03e0c244737f66e (diff) | |
| download | scala-76f167388a42e9bb8b72645d87bcb408b6981576.tar.gz scala-76f167388a42e9bb8b72645d87bcb408b6981576.tar.bz2 scala-76f167388a42e9bb8b72645d87bcb408b6981576.zip | |
Merge remote-tracking branch 'scala/2.10.x' into patmat-refactor-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Implicits.scala
Diffstat (limited to 'src/partest')
| -rw-r--r-- | src/partest/scala/tools/partest/nest/RunnerManager.scala | 2 |
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 0ed14dc858..8f28277a6c 100644 --- a/src/partest/scala/tools/partest/nest/RunnerManager.scala +++ b/src/partest/scala/tools/partest/nest/RunnerManager.scala @@ -720,7 +720,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) } } |