From 10298f82cae8419ecc17be7ba3201043bbad5b75 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Wed, 17 Sep 2003 08:30:30 +0000
Subject: [PATCH] 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
---
 .../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index 20c6c9e48..b64a1eb3d 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -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())) {