Par-Test includes log in transcript of failed exec

The previous behavior was that the Failure is generated
before the log is appended to the transcript.

That meant that the summary transcripts wouldn't include
the log file. Luckily, the transcript would say something
like "jvm > showFail-run.log".

1 files changed, 5 insertions, 4 deletions

diff --git a/src/partest/scala/tools/partest/nest/Runner.scala b/src/partest/scala/tools/partest/nest/Runner.scala
index d8e1eeb9b9..85679ad0b8 100644
--- a/src/partest/scala/tools/partest/nest/Runner.scala
+++ b/src/partest/scala/tools/partest/nest/Runner.scala
@@ -227,10 +227,11 @@ class Runner(val testFile: File, fileManager: FileManager, val testRunParams: Te
   private def execTest(outDir: File, logFile: File): Boolean = {
     val cmd = assembleTestCommand(outDir, logFile)
 
-    pushTranscript(cmd.mkString(" \\\n  ") + " > " + logFile.getName)
-    nextTestActionExpectTrue("non-zero exit code", runCommand(cmd, logFile)) || {
-      _transcript append logFile.fileContents
-      false
+    pushTranscript((cmd mkString s" \\$EOL  ") + " > " + logFile.getName)
+    nextTestAction(runCommand(cmd, logFile)) {
+      case false =>
+        _transcript append EOL + logFile.fileContents
+        genFail("non-zero exit code")
     }
   }