signatures. Just like java.lang.Cloneable. :-( git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@278092 13f79535-47bb-0310-9956-ffa450edef68master
@@ -56,7 +56,7 @@ the job table (see the <i>JDK Release Notes</i>).</p> | |||||
<p>Please note that the Java VM provided by HP doesn't follow OpenVMS' | <p>Please note that the Java VM provided by HP doesn't follow OpenVMS' | ||||
conventions of exit codes. If you run a Java VM with this task, the | conventions of exit codes. If you run a Java VM with this task, the | ||||
task may falsely claim that an error occured (or silently ignore an | |||||
task may falsely claim that an error occurred (or silently ignore an | |||||
error). Don't use this task to run <code>JAVA.EXE</code>, use a | error). Don't use this task to run <code>JAVA.EXE</code>, use a | ||||
<code><java></code> task with the <code>fork</code> attribute | <code><java></code> task with the <code>fork</code> attribute | ||||
set to <code>true</code> instead as this task will follow the VM's | set to <code>true</code> instead as this task will follow the VM's | ||||
@@ -161,7 +161,7 @@ | |||||
BaseSelectorTest provides the method <tt>performTests()</tt> which | BaseSelectorTest provides the method <tt>performTests()</tt> which | ||||
iterates over all files (and directories) in the String array <tt>filenames</tt> | iterates over all files (and directories) in the String array <tt>filenames</tt> | ||||
and checks whether the given selector returns the expected result. If an error | and checks whether the given selector returns the expected result. If an error | ||||
occured (especially the selector does not return the expected result) the test | |||||
occurred (especially the selector does not return the expected result) the test | |||||
fails and the failing filenames are logged.</p> | fails and the failing filenames are logged.</p> | ||||
<p>An example test would be:<pre> | <p>An example test would be:<pre> | ||||
@@ -593,8 +593,8 @@ public class JUnitTestRunner implements TestListener { | |||||
new java.io.BufferedReader(new java.io.FileReader(args[0])); | new java.io.BufferedReader(new java.io.FileReader(args[0])); | ||||
String testCaseName; | String testCaseName; | ||||
int code = 0; | int code = 0; | ||||
boolean errorOccured = false; | |||||
boolean failureOccured = false; | |||||
boolean errorOccurred = false; | |||||
boolean failureOccurred = false; | |||||
String line = null; | String line = null; | ||||
while ((line = reader.readLine()) != null) { | while ((line = reader.readLine()) != null) { | ||||
StringTokenizer st = new StringTokenizer(line, ","); | StringTokenizer st = new StringTokenizer(line, ","); | ||||
@@ -604,11 +604,11 @@ public class JUnitTestRunner implements TestListener { | |||||
t.setOutfile(st.nextToken()); | t.setOutfile(st.nextToken()); | ||||
code = launch(t, haltError, stackfilter, haltFail, | code = launch(t, haltError, stackfilter, haltFail, | ||||
showOut, logTestListenerEvents, props); | showOut, logTestListenerEvents, props); | ||||
errorOccured = (code == ERRORS); | |||||
failureOccured = (code != SUCCESS); | |||||
if (errorOccured || failureOccured) { | |||||
if ((errorOccured && haltError) | |||||
|| (failureOccured && haltFail)) { | |||||
errorOccurred = (code == ERRORS); | |||||
failureOccurred = (code != SUCCESS); | |||||
if (errorOccurred || failureOccurred) { | |||||
if ((errorOccurred && haltError) | |||||
|| (failureOccurred && haltFail)) { | |||||
registerNonCrash(noCrashFile); | registerNonCrash(noCrashFile); | ||||
System.exit(code); | System.exit(code); | ||||
} else { | } else { | ||||
@@ -62,7 +62,7 @@ public class Watchdog implements Runnable { | |||||
} | } | ||||
/** | /** | ||||
* Inform the observers that a timeout has occured. | |||||
* Inform the observers that a timeout has occurred. | |||||
*/ | */ | ||||
protected final void fireTimeoutOccured() { | protected final void fireTimeoutOccured() { | ||||
Enumeration e = observers.elements(); | Enumeration e = observers.elements(); | ||||
@@ -431,7 +431,7 @@ public abstract class BuildFileTest extends TestCase { | |||||
/** | /** | ||||
* Fired after the last target has finished. This event | * Fired after the last target has finished. This event | ||||
* will still be thrown if an error occured during the build. | |||||
* will still be thrown if an error occurred during the build. | |||||
* | * | ||||
* @see BuildEvent#getException() | * @see BuildEvent#getException() | ||||
*/ | */ | ||||
@@ -449,7 +449,7 @@ public abstract class BuildFileTest extends TestCase { | |||||
/** | /** | ||||
* Fired when a target has finished. This event will | * Fired when a target has finished. This event will | ||||
* still be thrown if an error occured during the build. | |||||
* still be thrown if an error occurred during the build. | |||||
* | * | ||||
* @see BuildEvent#getException() | * @see BuildEvent#getException() | ||||
*/ | */ | ||||
@@ -468,7 +468,7 @@ public abstract class BuildFileTest extends TestCase { | |||||
/** | /** | ||||
* Fired when a task has finished. This event will still | * Fired when a task has finished. This event will still | ||||
* be throw if an error occured during the build. | |||||
* be throw if an error occurred during the build. | |||||
* | * | ||||
* @see BuildEvent#getException() | * @see BuildEvent#getException() | ||||
*/ | */ | ||||