geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r655740 - /geronimo/server/trunk/testsuite/pom.xml
Date Tue, 13 May 2008 05:23:26 GMT
Author: jdillon
Date: Mon May 12 22:23:26 2008
New Revision: 655740

URL: http://svn.apache.org/viewvc?rev=655740&view=rev
Log:
Re-hookup per-assembly test excludes

Modified:
    geronimo/server/trunk/testsuite/pom.xml

Modified: geronimo/server/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/pom.xml?rev=655740&r1=655739&r2=655740&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/pom.xml (original)
+++ geronimo/server/trunk/testsuite/pom.xml Mon May 12 22:23:26 2008
@@ -38,7 +38,15 @@
     <description>
         Geronimo integration testsuite.
     </description>
-
+    
+    <properties>
+        <!--
+        NOTE: The default assembly is jetty, so exclude any tomcat tests by default.
+              Profiles below should toggle this as the assemblyId is changed.
+        -->
+        <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
+    </properties>
+    
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.testsupport</groupId>
@@ -53,7 +61,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    
     <build>
         <!--
         <extensions>
@@ -231,12 +239,8 @@
                             <includes>
                                 <include>*/*/pom.xml</include>
                             </includes>
-                            
-                            <!--
-                            TODO: Need to find a better way to run container specific integration
tests.
-                            -->
                             <excludes>
-                                <exclude>web-testsuite/test-tomcat/pom.xml</exclude>
+                                <exclude>${shittyTestExcludes}</exclude>
                             </excludes>
                         </fileset>
                     </projects>
@@ -288,6 +292,32 @@
 
     <profiles>
         <profile>
+            <id>testsuite-with-jetty</id>
+            <activation>
+                <property>
+                    <name>assemblyId</name>
+                    <value>jetty</value>
+                </property>
+            </activation>
+            <properties>
+                <shittyTestExcludes>**/*tomcat*/pom.xml</shittyTestExcludes>
+            </properties>
+        </profile>
+        
+        <profile>
+            <id>testsuite-with-tomcat</id>
+            <activation>
+                <property>
+                    <name>assemblyId</name>
+                    <value>tomcat</value>
+                </property>
+            </activation>
+            <properties>
+                <shittyTestExcludes>**/*jetty*/pom.xml</shittyTestExcludes>
+            </properties>
+        </profile>
+        
+        <profile>
             <id>headless</id>
             <build>
                 <pluginManagement>
@@ -295,6 +325,7 @@
                         <plugin>
                             <groupId>org.codehaus.mojo</groupId>
                             <artifactId>selenium-maven-plugin</artifactId>
+                            <inherited>false</inherited>
                             <executions>
                                 <execution>
                                     <id>xvfb</id>



Mime
View raw message