Better way to ignore slow tests by default.

cdk · Oct 9, 2016 · 07d8b53 · 07d8b53
1 parent b0da84a
commit 07d8b53
Showing 1 changed file with 23 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -435,6 +435,27 @@
                     <target>1.7</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.16</version>
+                <configuration>
+                    <excludes>
+                        <!-- not a test class -->
+                        <exclude>**/TestMoleculeFactory.java</exclude>
+                        <!-- missing functionality -->
+                        <exclude>**/cdk/limitations/**</exclude>
+
+                        <!-- coverage tests need updating -->
+                        <exclude>**/*CoverageTest.java</exclude>
+                        <!-- module suites not needed -->
+                        <exclude>**/modulesuites/M*Tests.java</exclude>
+                        <!-- format tests do not work (cyclic dependency) -->
+                        <exclude>**/io/formats/*FormatTest.java</exclude>
+                    </excludes>
+                    <excludedGroups>org.openscience.cdk.SlowTest</excludedGroups>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -639,40 +660,9 @@
                 </configuration>
             </plugin>
         </plugins>
-    </reporting>
+    </reporting>  
 
     <profiles>
-        <profile>
-            <id>base</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <version>2.16</version>
-                        <configuration>
-                            <excludes>
-                                <!-- not a test class -->
-                                <exclude>**/TestMoleculeFactory.java</exclude>
-                                <!-- missing functionality -->
-                                <exclude>**/cdk/limitations/**</exclude>
-
-                                <!-- coverage tests need updating -->
-                                <exclude>**/*CoverageTest.java</exclude>
-                                <!-- module suites not needed -->
-                                <exclude>**/modulesuites/M*Tests.java</exclude>
-                                <!-- format tests do not work (cyclic dependency) -->
-                                <exclude>**/io/formats/*FormatTest.java</exclude>
-                            </excludes>
-                            <excludedGroups>org.openscience.cdk.SlowTest</excludedGroups>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
         <profile>
             <id>slow-tests</id>
             <build>
@@ -681,7 +671,7 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <version>2.16</version>
-                        <configuration>
+                        <configuration combine.self="override">
                             <excludes>
                                 <!-- not a test class -->
                                 <exclude>**/TestMoleculeFactory.java</exclude>