bodewig 2003/09/17 01:30:30
Modified: src/main/org/apache/tools/ant/taskdefs/optional/junit
JUnitTask.java
Log:
A test that has timed out must be considered an error, PR 23150
Revision Changes Path
1.82 +5 -3
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.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- JUnitTask.java 17 Sep 2003 08:22:50 -0000 1.81
+++ JUnitTask.java 17 Sep 2003 08:30:30 -0000 1.82
@@ -668,8 +668,10 @@
// if there is an error/failure and that it should halt, stop
// everything otherwise just log a statement
- boolean errorOccurredHere = exitValue == JUnitTestRunner.ERRORS;
- boolean failureOccurredHere = exitValue != JUnitTestRunner.SUCCESS;
+ boolean errorOccurredHere =
+ exitValue == JUnitTestRunner.ERRORS || wasKilled;
+ boolean failureOccurredHere =
+ exitValue != JUnitTestRunner.SUCCESS || wasKilled;
if (errorOccurredHere || failureOccurredHere) {
if ((errorOccurredHere && test.getHaltonerror())
|| (failureOccurredHere && test.getHaltonfailure())) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
