[teiid-commits] teiid SVN: r1825 - in trunk/test-integration/db: src/main/resources/ctc_tests and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: vhalbert at redhat.com
Date: 2010-02-15 11:13:34 -0500 (Mon, 15 Feb 2010)
New Revision: 1825

Modified:
   trunk/test-integration/db/pom.xml
   trunk/test-integration/db/runclienttest.sh
   trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties
   trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
Log:
Teiid-773 - changed to support running the testcases in hudson

Modified: trunk/test-integration/db/pom.xml
===================================================================
--- trunk/test-integration/db/pom.xml	2010-02-15 14:45:56 UTC (rev 1824)
+++ trunk/test-integration/db/pom.xml	2010-02-15 16:13:34 UTC (rev 1825)
@@ -399,6 +399,8 @@
 								<property name="query.scenario.classname"  value="${query.scenario.classname}"></property>
 								<property name="third.party.jars.dir"  value="${third.party.jars.dir}"></property>
 								<property name="proj.dir" value="${project.basedir}" />
+								<property name="usedatasources"  value="${usedatasources}"></property>
+								<property name="datasourceloc"  value="${datasourceloc}"></property>
 
 								<ant antfile="src/main/resources/ctc_tests/ctc.xml" />
 

Modified: trunk/test-integration/db/runclienttest.sh
===================================================================
--- trunk/test-integration/db/runclienttest.sh	2010-02-15 14:45:56 UTC (rev 1824)
+++ trunk/test-integration/db/runclienttest.sh	2010-02-15 16:13:34 UTC (rev 1825)
@@ -11,7 +11,17 @@
 
 VDB_DIR=./src/main/resources/transactions
 
-mvn integration-test  -Dscenario.dir=$SC_DIR -Dqueryset.artifacts.dir=$QS_DIR -Dvdb.artifacts.dir=$VDB_DIR -Prunclienttests
 
 
+if [ -z "${datasourceloc}" ] 
+	then
+	
+	datasourceloc='./src/main/resources/datasources'
+fi
 
+echo "Use Datasources: ${DS1} and ${DS2} loc: ${datasourceloc}"
+
+mvn integration-test -Dusedatasources=${DS1},${DS2}  -Ddatasourceloc=${datasourceloc}  -Dscenario.dir=$SC_DIR -Dqueryset.artifacts.dir=$QS_DIR -Dvdb.artifacts.dir=$VDB_DIR -Prunclienttests
+
+
+

Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties	2010-02-15 14:45:56 UTC (rev 1824)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc-test.properties	2010-02-15 16:13:34 UTC (rev 1825)
@@ -110,3 +110,5 @@
 #
 #
 
+pm1=1
+pm2=2

Modified: trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml
===================================================================
--- trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml	2010-02-15 14:45:56 UTC (rev 1824)
+++ trunk/test-integration/db/src/main/resources/ctc_tests/ctc.xml	2010-02-15 16:13:34 UTC (rev 1825)
@@ -166,11 +166,11 @@
 			  	<jvmarg value="-Dqueryset.artifacts.dir=${queryset_artifacts_dir}" />
 				<jvmarg value="-Dvdb.artifacts.dir=${vdb_artifacts_dir}" />
 		       	<jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" />
+				<jvmarg value="-Dusedatasources=${usedatasources}" />
+				<jvmarg value="-Ddatasourceloc=${datasourceloc}" />
 
-				  </java>
+			</java>
 
- 
-
 	</target>
 	
 	<target name="exec.linux"
@@ -193,7 +193,8 @@
           	<jvmarg value="-Dqueryset.artifacts.dir=${queryset.artifacts.dir}" />
         	<jvmarg value="-Dvdb.artifacts.dir=${vdb.artifacts.dir}" />
         	<jvmarg value="-Dquery.scenario.classname=${query.scenario.classname}" />
-            	
+			<jvmarg value="-Dusedatasources=${usedatasources}" />
+			<jvmarg value="-Ddatasourceloc=${datasourceloc}" />            	
 
       	  </java>