From ef6460b6e40f145c9538e714fbf22f9144e603ca Mon Sep 17 00:00:00 2001 From: Philipp Haller Date: Thu, 22 May 2008 13:25:45 +0000 Subject: When no check file exists, run test fails with ... When no check file exists, run test fails with correct log/diff. --- src/partest/scala/tools/partest/nest/CompileManager.scala | 3 ++- src/partest/scala/tools/partest/nest/Worker.scala | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) (limited to 'src/partest') diff --git a/src/partest/scala/tools/partest/nest/CompileManager.scala b/src/partest/scala/tools/partest/nest/CompileManager.scala index c43ec8fca6..50999dd651 100644 --- a/src/partest/scala/tools/partest/nest/CompileManager.scala +++ b/src/partest/scala/tools/partest/nest/CompileManager.scala @@ -200,7 +200,8 @@ class CompileManager(val fileManager: FileManager) { NestUI.verbose("while invoking compiler ("+file+"):") NestUI.verbose("caught "+t) t.printStackTrace - t.getCause.printStackTrace + if (t.getCause != null) + t.getCause.printStackTrace false } } diff --git a/src/partest/scala/tools/partest/nest/Worker.scala b/src/partest/scala/tools/partest/nest/Worker.scala index 58cad347ea..6f607c8f7c 100644 --- a/src/partest/scala/tools/partest/nest/Worker.scala +++ b/src/partest/scala/tools/partest/nest/Worker.scala @@ -210,7 +210,7 @@ class Worker(val fileManager: FileManager) extends Actor { val reader = new BufferedReader(new FileReader(logFile)) val swriter = new StringWriter val pwriter = new PrintWriter(swriter, true) - val appender = new StreamAppender(reader, writer) + val appender = new StreamAppender(reader, pwriter) appender.run() log = swriter.toString } @@ -236,7 +236,14 @@ class Worker(val fileManager: FileManager) extends Actor { else new File(dir, fileBase + "-" + kind + ".check") } - if (!checkFile.exists || !checkFile.canRead) "" + if (!checkFile.exists || !checkFile.canRead) { + val reader = new BufferedReader(new FileReader(logFile)) + val swriter = new StringWriter + val pwriter = new PrintWriter(swriter, true) + val appender = new StreamAppender(reader, pwriter) + appender.run() + swriter.toString + } else fileManager.compareFiles(logFile, checkFile) } -- cgit v1.2.3