Author: bayard
Date: Thu Feb 15 00:08:54 2007
New Revision: 507851

URL: http://svn.apache.org/viewvc?view=rev&rev=507851
Log:
Merge in the m2 and m1 generated junit xmls. SUREFIRE-160 means that the m2 
numbers are wildly off

Modified:
    jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m1-config.tmpl
    jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m2-config.tmpl

Modified: 
jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m1-config.tmpl
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m1-config.tmpl?view=diff&rev=507851&r1=507850&r2=507851
==============================================================================
--- jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m1-config.tmpl 
(original)
+++ jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m1-config.tmpl 
Thu Feb 15 00:08:54 2007
@@ -18,7 +18,10 @@
                goal="clean jar"/>
     </schedule>
 
-    <log logdir="logs/m1-COMPONENT"/>
+    <log logdir="logs/m1-COMPONENT">
+        <merge dir="m1/COMPONENT_DIRECTORY/COMPONENT/"
+               pattern="TEST-*.xml" />
+    </log>
 
     <publishers>
     </publishers>

Modified: 
jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m2-config.tmpl
URL: 
http://svn.apache.org/viewvc/jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m2-config.tmpl?view=diff&rev=507851&r1=507850&r2=507851
==============================================================================
--- jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m2-config.tmpl 
(original)
+++ jakarta/commons/proper/commons-nightly/trunk/cruisecontrol/m2-config.tmpl 
Thu Feb 15 00:08:54 2007
@@ -18,7 +18,10 @@
                goal="clean package"/>
     </schedule>
 
-    <log logdir="logs/m2-COMPONENT"/>
+    <log logdir="logs/m2-COMPONENT">
+        <merge dir="m2/COMPONENT_DIRECTORY/COMPONENT/"
+               pattern="TEST-*.xml" />
+    </log>
 
     <publishers>
     </publishers>



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

Reply via email to