[PATCH] magic halt_hone_error/failure property now working

[pnb]

Hi,
moved down the setting of the HAL_ON_ERROR/ HALT_ON_FAILURE to take effect.

/peter <<magic.txt>> 

---------------------------------
Peter Neubauer
Software Manager
ScanCoin Industries AB

Index: tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
===================================================================
--- tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java       
(revision 47557)
+++ tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java       
(working copy)
@@ -233,15 +233,7 @@
         junit.setShowOutput( true );
         junit.setTempdir( working );
         junit.setReloading( true );
-        junit.setFiltertrace( true );
         junit.createClasspath().add( classpath );
-        junit.setHaltonerror( 
-          getBooleanProperty( 
-            HALT_ON_ERROR_KEY, HALT_ON_ERROR_VALUE ) );
-        junit.setHaltonfailure( 
-          getBooleanProperty( 
-            HALT_ON_FAILURE_KEY, HALT_ON_FAILURE_VALUE ) );
-
         final File reports = getContext().getTestReportsDirectory();
         mkDir( reports );
 
@@ -288,12 +280,21 @@
         junit.setErrorProperty( ERROR_KEY );
         junit.setFailureProperty( FAILURE_KEY );
         junit.setTaskName( getTaskName() );
-       if( getForkProperty() )
+
+        if( getForkProperty() )
         {
             junit.setFork( true );
             junit.setDir( project.getBaseDir() );
         }
-        
+        junit.setFiltertrace( true ); 
+        junit.setHaltonerror( 
+          getBooleanProperty( 
+            HALT_ON_ERROR_KEY, HALT_ON_ERROR_VALUE ) );
+        junit.setHaltonfailure(
+          getBooleanProperty( 
+            HALT_ON_FAILURE_KEY, HALT_ON_FAILURE_VALUE ) );
+
+
         junit.execute();
     }
     

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]