diff options
| author | Paul Phillips <paulp@improving.org> | 2013-05-11 09:04:26 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-05-11 09:04:26 -0700 |
| commit | c85a507ba815643faacd8e07270efbd83b700846 (patch) | |
| tree | 4cb6cf18fed5553859c06ef5a9bbb47501546ec7 | |
| parent | 114b4231402b26b45349a6e72100cc1b0a7460bd (diff) | |
| parent | 9e257979ed8799cb9a45b50827449b472b665249 (diff) | |
| download | scala-c85a507ba815643faacd8e07270efbd83b700846.tar.gz scala-c85a507ba815643faacd8e07270efbd83b700846.tar.bz2 scala-c85a507ba815643faacd8e07270efbd83b700846.zip | |
Merge pull request #2512 from som-snytt/issue/partest-exec-log
Par-Test includes log in transcript of failed exec
| -rw-r--r-- | src/partest/scala/tools/partest/nest/Runner.scala | 9 |
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") } } |