Browse Source

A test that has timed out must be considered an error, PR 23150

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@275246 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 21 years ago
parent
commit
10298f82ca
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java

+ 4
- 2
src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -668,8 +668,10 @@ public class JUnitTask extends Task {

// 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())) {


Loading…
Cancel
Save