From ebb8773e0054588da5265ce9ddc5dd53e96d3780 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Tue, 11 Feb 2014 23:51:39 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)    58638:
 BDE-243 Use testFailureIgnore to keep on executing test even if first batch
 contains error + tidy surefire config a bit

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62009 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index d2ab837cec..5d88a81f6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -883,12 +883,8 @@
                                      <goal>test</goal>
                                  </goals>
                                  <configuration>
-                                     <!-- These are the default fork options -->
-                                     <forkCount>1</forkCount>
-                                     <reuseForks>true</reuseForks>
-                                     <!-- end of default fork options -->
                                      <groups>org.alfresco.test_category.BaseSpringTestsCategory</groups>
-                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory</excludedGroups>        
+                                     <testFailureIgnore>true</testFailureIgnore>
                                  </configuration>
                             </execution>
                             <!-- Execution for tests which require their own JVM -->
@@ -899,18 +895,17 @@
                                  </goals>
                                  <phase>process-test-classes</phase>
                                  <configuration>
-                                     <argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-                                     <!-- Equivalent of forkMode="always" -->
-                                     <forkCount>1</forkCount>
                                      <reuseForks>false</reuseForks>
-                                     <!-- end of fork options -->
                                      <groups>org.alfresco.test_category.OwnJVMTestsCategory</groups>
+                                     <testFailureIgnore>true</testFailureIgnore>
                                  </configuration>
                             </execution>
                             <execution>
                                  <id>default-test</id>
                                  <configuration>
+                                     <argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
                                      <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory, org.alfresco.test_category.BaseSpringTestsCategory,org.alfresco.test_category.LegacyCategory</excludedGroups>                                 
+                                     <testFailureIgnore>true</testFailureIgnore>
                                  </configuration>
                              </execution>
                              <execution>
@@ -919,20 +914,13 @@
                                      <goal>test</goal>
                                  </goals>
                                  <configuration>
-                                     <argLine>-Xmx2560m -XX:MaxPermSize=512m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
-                                     <!-- These are the default fork options -->
-                                     <forkCount>1</forkCount>
-                                     <reuseForks>true</reuseForks>
-                                     <!-- end of default fork options -->
                                      <groups>org.alfresco.test_category.LegacyCategory</groups>
-                                     <excludedGroups>org.alfresco.test_category.OwnJVMTestsCategory,org.alfresco.test_category.BaseSpringTestsCategory</excludedGroups>        
                                  </configuration>
                             </execution>
                         </executions>
 
                         <!-- Default configuration, specifying which tests to pass -->
                         <configuration>
-                            <argLine>-Xmx2560m -XX:MaxPermSize=256m -Duser.language=en -Dcom.sun.management.jmxremote</argLine>
                             <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
                             <includes>
                                 <!-- Standard test names -->
@@ -944,7 +932,6 @@
                             </includes>
                             <excludes>
                                 <exclude>**/org/alfresco/RepositoryStartupTest.*</exclude>
-
                                 <!-- Failing tests which are not run with Ant - OK to exclude -->
                                 <exclude>**/org/alfresco/encryption/EncryptionTests.*</exclude>
                                 <exclude>**/org/alfresco/jcr/test/BaseJCRTest.*</exclude>