modules/enterprise/gui/installer/pom.xml | 16 ++++++++++++++++ modules/enterprise/server/itests-2/pom.xml | 9 +++++++++ 2 files changed, 25 insertions(+)
New commits: commit 88571559a63a7cd9d6ae92e0bf059c05d33f07e1 Author: Jay Shaughnessy jshaughn@jshaughn.csb Date: Mon Nov 26 17:15:03 2012 -0500
make sure surefire has the necessary db env vars since test execution may be forked and lose the context of the original process.
diff --git a/modules/enterprise/gui/installer/pom.xml b/modules/enterprise/gui/installer/pom.xml index 93e3f79..81fda8e 100644 --- a/modules/enterprise/gui/installer/pom.xml +++ b/modules/enterprise/gui/installer/pom.xml @@ -167,6 +167,22 @@
<plugins>
+ <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping> + <rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name> + <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name> + <rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url> + <rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username> + <rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password> + <rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name> + <rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>gwt-maven-plugin</artifactId> diff --git a/modules/enterprise/server/itests-2/pom.xml b/modules/enterprise/server/itests-2/pom.xml index 463250a..d22d090 100644 --- a/modules/enterprise/server/itests-2/pom.xml +++ b/modules/enterprise/server/itests-2/pom.xml @@ -651,6 +651,15 @@ <clean.db>${clean.db}</clean.db> <log4j.configDebug>false</log4j.configDebug> <project.version>${project.version}</project.version> + + <rhq.test.ds.type-mapping>${rhq.test.ds.type-mapping}</rhq.test.ds.type-mapping> + <rhq.test.ds.server-name>${rhq.test.ds.server-name}</rhq.test.ds.server-name> + <rhq.test.ds.db-name>${rhq.test.ds.db-name}</rhq.test.ds.db-name> + <rhq.test.ds.connection-url>${rhq.test.ds.connection-url}</rhq.test.ds.connection-url> + <rhq.db.admin.username>${rhq.db.admin.username}</rhq.db.admin.username> + <rhq.db.admin.password>${rhq.db.admin.password}</rhq.db.admin.password> + <rhq.test.ds.user-name>${rhq.test.ds.user-name}</rhq.test.ds.user-name> + <rhq.test.ds.password>${rhq.test.ds.password}</rhq.test.ds.password> </systemPropertyVariables> <additionalClasspathElements> <!-- The below is required for tests to run against Oracle. -->
rhq-commits@lists.fedorahosted.org