bodewig 2003/10/22 07:39:43
Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit Tag:
ANT_16_BRANCH JUnitTask.java
Log:
Merge from HEAD
Revision Changes Path
No revision
No revision
1.83.2.5 +3 -2
ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
Index: JUnitTask.java
===================================================================
RCS file:
/home/cvs/ant/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java,v
retrieving revision 1.83.2.4
retrieving revision 1.83.2.5
diff -u -r1.83.2.4 -r1.83.2.5
--- JUnitTask.java 20 Oct 2003 10:48:47 -0000 1.83.2.4
+++ JUnitTask.java 22 Oct 2003 14:39:43 -0000 1.83.2.5
@@ -1129,6 +1129,8 @@
private void logTimeout(FormatterElement[] feArray, JUnitTest test) {
createClassLoader();
+ test.setCounts(1, 0, 1);
+ test.setProperties(getProject().getProperties());
for (int i = 0; i < feArray.length; i++) {
FormatterElement fe = feArray[i];
File outFile = getOutput(fe, test);
@@ -1158,7 +1160,6 @@
OutputStream out) {
formatter.setOutput(out);
formatter.startTestSuite(test);
- test.setCounts(1, 0, 1);
Test t = new Test() {
public int countTestCases() { return 1; }
public void run(TestResult r) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
