Author: robbie Date: Fri Mar 7 12:13:16 2014 New Revision: 1575242 URL: http://svn.apache.org/r1575242 Log: QPID-5048: get the tests running again for the perftests module
Patch submitted by Andrew MacBean <[email protected]> Modified: qpid/trunk/qpid/java/bdbstore/systests/pom.xml qpid/trunk/qpid/java/perftests/pom.xml qpid/trunk/qpid/java/qpid-systests-parent/pom.xml qpid/trunk/qpid/java/systests/pom.xml Modified: qpid/trunk/qpid/java/bdbstore/systests/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/pom.xml?rev=1575242&r1=1575241&r2=1575242&view=diff ============================================================================== --- qpid/trunk/qpid/java/bdbstore/systests/pom.xml (original) +++ qpid/trunk/qpid/java/bdbstore/systests/pom.xml Fri Mar 7 12:13:16 2014 @@ -67,4 +67,8 @@ </dependency> </dependencies> + <build> + <testSourceDirectory>src/main/java</testSourceDirectory> + </build> + </project> Modified: qpid/trunk/qpid/java/perftests/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/pom.xml?rev=1575242&r1=1575241&r2=1575242&view=diff ============================================================================== --- qpid/trunk/qpid/java/perftests/pom.xml (original) +++ qpid/trunk/qpid/java/perftests/pom.xml Fri Mar 7 12:13:16 2014 @@ -29,6 +29,10 @@ <name>Qpid Performance Tests</name> <description>Performance testing configuration, code and tests</description> + <properties> + <test.systest.resource.directory>${basedir}/../systests</test.systest.resource.directory> + </properties> + <dependencies> <!-- client deps --> <dependency> @@ -86,4 +90,29 @@ </dependency> </dependencies> + <build> + <testResources> + <testResource> + <directory>src/test/java</directory> + <excludes> + <exclude>**/*.java</exclude> + </excludes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + </testResource> + </testResources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-deploy-plugin</artifactId> + <!--version specified in parent pluginManagement --> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + + </build> </project> Modified: qpid/trunk/qpid/java/qpid-systests-parent/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/qpid-systests-parent/pom.xml?rev=1575242&r1=1575241&r2=1575242&view=diff ============================================================================== --- qpid/trunk/qpid/java/qpid-systests-parent/pom.xml (original) +++ qpid/trunk/qpid/java/qpid-systests-parent/pom.xml Fri Mar 7 12:13:16 2014 @@ -38,6 +38,7 @@ <test.log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</test.log4j.configuration.file> <test.working.directory>${basedir}/..</test.working.directory> <test.resource.directory>${basedir}/..</test.resource.directory> + <test.systest.resource.directory>${basedir}</test.systest.resource.directory> </properties> <dependencies> @@ -81,8 +82,6 @@ </resource> </resources> - <testSourceDirectory>src/main/java</testSourceDirectory> - <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -128,7 +127,7 @@ <outputDirectory>${qpid.home}</outputDirectory> <resources> <resource> - <directory>${basedir}</directory> + <directory>${test.systest.resource.directory}</directory> <includes> <include>etc/</include> </includes> Modified: qpid/trunk/qpid/java/systests/pom.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/pom.xml?rev=1575242&r1=1575241&r2=1575242&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/pom.xml (original) +++ qpid/trunk/qpid/java/systests/pom.xml Fri Mar 7 12:13:16 2014 @@ -185,4 +185,8 @@ </dependencies> + <build> + <testSourceDirectory>src/main/java</testSourceDirectory> + </build> + </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
