2:15 p.m.
modules/enterprise/server/jar/pom.xml | 66 +++++++++++++++++++++++++++-------
1 file changed, 53 insertions(+), 13 deletions(-)
New commits:
commit fdf959368138670e5135bee7b7f6cb91b12673d1
Merge: ae6302c 49db235
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 28 15:15:33 2012 -0500
Merge remote-tracking branch 'origin/master' into bug/747925
commit 49db23558976f60ab1b7ed5714a09e0eb58d8ec5
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Tue Feb 28 15:14:58 2012 -0500
fix the maven test code in server/jar pom.xml so we don't run tests more than once
when using -Dtest=
diff --git a/modules/enterprise/server/jar/pom.xml
b/modules/enterprise/server/jar/pom.xml
index ac85d7d..018b3b4 100644
--- a/modules/enterprise/server/jar/pom.xml
+++ b/modules/enterprise/server/jar/pom.xml
@@ -709,19 +709,6 @@ Build-OS-Version=${os.version}
</configuration>
</execution>
- <execution>
- <id>dbTestsOnly</id>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skipTests>${skipTests}</skipTests>
- <includes>
-
<include>org/rhq/enterprise/server/db/**</include>
- </includes>
- <failIfNoTests>false</failIfNoTests>
- </configuration>
- </execution>
</executions>
</plugin>
@@ -784,6 +771,59 @@ Build-OS-Version=${os.version}
<profiles>
<profile>
+ <!-- only if we are not running an individual set of tests via -Dtest do we
do this -->
+ <id>no-individual-test</id>
+ <activation>
+ <property><name>!test</name></property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <!-- Everything but the web service tests, this is the standard test
execution -->
+ <configuration>
+ <skipTests>true</skipTests>
+
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
+ <groups>${rhq.testng.includedGroups}</groups>
+ <properties>
+ <property>
+ <name>listener</name>
+ <value>org.rhq.test.testng.StdoutReporter</value>
+ </property>
+ </properties>
+ <systemPropertyVariables>
+ <embeddedDeployment>true</embeddedDeployment>
+
<deploymentDirectory>target/classes</deploymentDirectory>
+
<hibernate.dialect>${rhq.test.ds.hibernate-dialect}</hibernate.dialect>
+ <clean.db>${clean.db}</clean.db>
+ <log4j.configDebug>false</log4j.configDebug>
+ </systemPropertyVariables>
+ <additionalClasspathElements>
+ <!-- The below is required for tests to run against Oracle.
-->
+
<additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc6/${ojdbc6.version}/ojdbc6-${ojdbc6.version}.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ </configuration>
+ <executions>
+ <execution>
+ <id>dbTestsOnly</id>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <skipTests>${skipTests}</skipTests>
+ <includes>
+
<include>org/rhq/enterprise/server/db/**</include>
+ </includes>
+ <failIfNoTests>false</failIfNoTests>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
<id>dev</id>
<properties>