[jboss-svn-commits] JBL Code SVN: r36744 - in labs/jbosstm/trunk/qa: tests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: tomjenkinson
Date: 2011-02-25 05:27:27 -0500 (Fri, 25 Feb 2011)
New Revision: 36744

Modified:
   labs/jbosstm/trunk/qa/run-tests.xml
   labs/jbosstm/trunk/qa/tests/build-core.xml
Log:
JBTM-574 updated to allow an external distribution to be tested

Modified: labs/jbosstm/trunk/qa/run-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/run-tests.xml	2011-02-25 10:23:20 UTC (rev 36743)
+++ labs/jbosstm/trunk/qa/run-tests.xml	2011-02-25 10:27:27 UTC (rev 36744)
@@ -36,6 +36,8 @@
 
 -->
 <project name="QA Tests for JBossTS" default="junit" basedir=".">
+    <!-- set this property to the location of a JBossTS core build -->
+    <property name="org.jboss.jbossts.qa.ts.home" location="../install/"/>
 
     <property name="working.dir" location="build"/>
 
@@ -377,17 +379,17 @@
                     <include name="jbossts-*-qa.jar"/>
                 </fileset>
 
-                <fileset dir="../install/lib">
+                <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib">
                     <include name="*.jar"/>
                 </fileset>
-                <fileset dir="../install/lib/ext">
+                <fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/ext">
                     <include name="*.jar"/>
                     <include name="*.zip"/>
                 </fileset>
                 <fileset dir="../ArjunaJTS/jts/build/lib">
                     <include name="jts_tests.jar"/>
                 </fileset>
-                <pathelement location="../install/etc"/>
+                <pathelement location="${org.jboss.jbossts.qa.ts.home}/etc"/>
 
             </classpath>
 

Modified: labs/jbosstm/trunk/qa/tests/build-core.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/build-core.xml	2011-02-25 10:23:20 UTC (rev 36743)
+++ labs/jbosstm/trunk/qa/tests/build-core.xml	2011-02-25 10:27:27 UTC (rev 36744)
@@ -32,7 +32,7 @@
 		<fileset dir="${org.jboss.jbossts.qa.ts.home}/lib/">
 			<include name="arjunacore.jar"/>
 		</fileset>
-        <fileset dir="../../build/extlib" includes="junit.jar"/>
+        <pathelement location="../../build/extlib/junit.jar"/>
         <pathelement location="../ext/jboss-profiler-jvmti.jar"/>
 	</path>