avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject svn commit: rev 54234 - in avalon/trunk/tools/magic: . src/main/org/apache/avalon/tools/tasks
Date Sun, 10 Oct 2004 09:16:20 GMT
Author: niclas
Date: Sun Oct 10 02:16:19 2004
New Revision: 54234

Modified:
   avalon/trunk/tools/magic/build.xml
   avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
Log:
Reverting the Fork policy change.

Modified: avalon/trunk/tools/magic/build.xml
==============================================================================
--- avalon/trunk/tools/magic/build.xml	(original)
+++ avalon/trunk/tools/magic/build.xml	Sun Oct 10 02:16:19 2004
@@ -21,12 +21,6 @@
   </target>
   -->
 
-  <!--
-  <target name="build" depends="standard.build">
-    <x:artifact factory="xyz"/>
-  </target>
-  -->
-
   <target name="package" depends="standard.package">
     <x:bar/>
   </target>

Modified: avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java
==============================================================================
--- avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	(original)
+++ avalon/trunk/tools/magic/src/main/org/apache/avalon/tools/tasks/JUnitTestTask.java	Sun
Oct 10 02:16:19 2004
@@ -292,11 +292,18 @@
         junit.setTaskName( getTaskName() );
 	  if( getForkProperty() )
         {
-            JUnitTask.ForkMode mode = getForkMode();
-            log( "Executing forked test with mode: '" + mode + "'." );
             junit.setFork( true );
             junit.setDir( project.getBaseDir() );
-            junit.setForkMode( mode );
+            JUnitTask.ForkMode mode = getForkMode();
+            if( null != mode )
+            {
+                log( "Executing forked test." );
+            }
+            else
+            {
+                log( "Executing forked test with mode: '" + mode + "'." );
+                junit.setForkMode( mode );
+            }
         }
         else
         {
@@ -365,7 +372,7 @@
         final String value = getProject().getProperty( TEST_FORK_MODE_KEY );
         if( null == value )
         {
-            return new JUnitTask.ForkMode( JUnitTask.ForkMode.ONCE );
+            return null;
         }
         else 
         {

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message