Permalink
Browse files

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".
  • Loading branch information...
som-snytt committed May 10, 2013
1 parent 9a2f6c7 commit 9e257979ed8799cb9a45b50827449b472b665249
Showing with 5 additions and 4 deletions.
  1. +5 −4 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")
}
}

0 comments on commit 9e25797

Please sign in to comment.