Author: antoine
Date: Sun Jan 31 23:13:49 2010
New Revision: 905136
URL: http://svn.apache.org/viewvc?rev=905136&view=rev
Log:
JUnit stack traces were missing when filtertrace="on", the default. Reported by
N C, see http://marc.info/?l=ant-user&m=126488326902069&w=1 and
http://marc.info/?l=ant-dev&m=126491578731948&w=2
Modified:
ant/core/trunk/WHATSNEW
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Modified: ant/core/trunk/WHATSNEW
URL:
http://svn.apache.org/viewvc/ant/core/trunk/WHATSNEW?rev=905136&r1=905135&r2=905136&view=diff
==============================================================================
--- ant/core/trunk/WHATSNEW (original)
+++ ant/core/trunk/WHATSNEW Sun Jan 31 23:13:49 2010
@@ -7,6 +7,9 @@
Fixed bugs:
-----------
+ * stack traces were not reported at all by <junit/>
+ when filtertrace="on", which is the default.
+
Other changes:
--------------
Modified:
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
URL:
http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java?rev=905136&r1=905135&r2=905136&view=diff
==============================================================================
---
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
(original)
+++
ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTestRunner.java
Sun Jan 31 23:13:49 2010
@@ -44,6 +44,7 @@
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Permissions;
+import org.apache.tools.ant.util.FileUtils;
import org.apache.tools.ant.util.StringUtils;
import org.apache.tools.ant.util.TeeOutputStream;
@@ -898,6 +899,8 @@
}
} catch (Exception e) {
return stack; // return the stack unfiltered
+ } finally {
+ FileUtils.close(pw);
}
return sw.toString();
}
