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

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

Author: tomjenkinson
Date: 2011-08-11 08:06:50 -0400 (Thu, 11 Aug 2011)
New Revision: 37385

Modified:
   labs/jbosstm/trunk/qa/TaskImpl.properties
   labs/jbosstm/trunk/qa/build.xml
   labs/jbosstm/trunk/qa/tests/product/build.xml
   labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml
Log:
updated to work better with the new style distribution

Modified: labs/jbosstm/trunk/qa/TaskImpl.properties
===================================================================
--- labs/jbosstm/trunk/qa/TaskImpl.properties	2011-08-11 11:36:16 UTC (rev 37384)
+++ labs/jbosstm/trunk/qa/TaskImpl.properties	2011-08-11 12:06:50 UTC (rev 37385)
@@ -30,15 +30,14 @@
 # file we use command line override of some properties.
 #
 COMMAND_LINE_2=\
-  ..${file.separator}install${file.separator}etc${file.separator}\
-  ${path.separator}..${file.separator}install${file.separator}lib${file.separator}*\
-  ${path.separator}..${file.separator}install${file.separator}lib${file.separator}ext${file.separator}*\
-  ${path.separator}..${file.separator}install${file.separator}jacorb${file.separator}lib${file.separator}*\
-  ${path.separator}..${file.separator}install${file.separator}jacorb${file.separator}etc${file.separator}\
+  dist${file.separator}narayana-5.0.0.M1-SNAPSHOT${file.separator}etc${file.separator}\
+  ${path.separator}dist${file.separator}narayana-5.0.0.M1-SNAPSHOT${file.separator}lib${file.separator}*\
+  ${path.separator}dist${file.separator}narayana-5.0.0.M1-SNAPSHOT${file.separator}lib${file.separator}ext${file.separator}*\
+  ${path.separator}dist${file.separator}narayana-5.0.0.M1-SNAPSHOT${file.separator}jacorb${file.separator}lib${file.separator}*\
+  ${path.separator}dist${file.separator}narayana-5.0.0.M1-SNAPSHOT${file.separator}jacorb${file.separator}etc${file.separator}\
   ${path.separator}ext${file.separator}fscontext.jar${path.separator}ext${file.separator}providerutil.jar\
   ${path.separator}ext${file.separator}jboss-profiler-jvmti.jar${path.separator}ext${file.separator}jboss-logging-spi.jar\
-  ${path.separator}tests${file.separator}build${file.separator}jbossts-jts-qa.jar\
-  ${path.separator}..${file.separator}ArjunaJTS${file.separator}jts${file.separator}build${file.separator}lib${file.separator}jts_tests.jar\
+  ${path.separator}tests${file.separator}build${file.separator}*\
   ${path.separator}dbdrivers${file.separator}selected_dbdriver${file.separator}*\
   ${path.separator}..${file.separator}build${file.separator}extlib${file.separator}emma.jar\
   ${path.separator}..${file.separator}build${file.separator}extlib${file.separator}netty.jar

Modified: labs/jbosstm/trunk/qa/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/build.xml	2011-08-11 11:36:16 UTC (rev 37384)
+++ labs/jbosstm/trunk/qa/build.xml	2011-08-11 12:06:50 UTC (rev 37385)
@@ -75,6 +75,8 @@
     <available file="${driver.home}" property="have.dbdrivers" value="true"/>
   </target>
   <target name="clean">
+    <delete dir="dbdrivers"/>
+    <delete dir="testoutput"/>
     <delete dir="${org.jboss.jbossts.qa.dist.buildroot}"/>
     <delete dir="${org.jboss.jbossts.qa.ts.home}"/>
     <!-- always use jts regardless of build type, as we may not be able to

Modified: labs/jbosstm/trunk/qa/tests/product/build.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/product/build.xml	2011-08-11 11:36:16 UTC (rev 37384)
+++ labs/jbosstm/trunk/qa/tests/product/build.xml	2011-08-11 12:06:50 UTC (rev 37385)
@@ -44,7 +44,7 @@
     <property name="lib.dir" value="${basedir}/lib" />
     <property name="build.dir" value="${basedir}/build" />
     <property name="build.classes.dir" value="${build.dir}/classes" />
-    <property name="jbossts.install" value="../../../install" />
+    <property name="jbossts.install" value="../../dist/narayana-5.0.0.M1-SNAPSHOT" />
     <!--
         location of resources needed by the various products
       -->
@@ -76,7 +76,7 @@
     <!-- JBossTS: http://www.jboss.org/download/ the current build -->
     <path id="classpath.jbossts">
         <pathelement location="${jbossts.install}/lib/narayana-jta.jar" />
-        <pathelement location="${jbossts.install}/../ext/netty.jar" />
+        <pathelement location="${jbossts.install}/../../ext/netty.jar" />
         <pathelement location="${jbossts.install}/lib/ext/hornetq-core.jar" />
         <pathelement location="${jbossts.install}/lib/ext/jboss-logging.jar" />
     </path>

Modified: labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml
===================================================================
--- labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml	2011-08-11 11:36:16 UTC (rev 37384)
+++ labs/jbosstm/trunk/qa/tests/scripts/as-tests.xml	2011-08-11 12:06:50 UTC (rev 37385)
@@ -6,7 +6,7 @@
   <property environment="env"/>
   <property name="jboss.home" value="${env.JBOSS_HOME}"/>
   <property name="xxproduct.dir" value="${env.DTF_HOME}/JBossTS-JTA-QA/"/>
-  <property name="product.dir" value="../../.."/>
+  <property name="product.dir" value="../../dist/narayana-5.0.0.M1-SNAPSHOT"/>
   <property name="astest.jar" value="qa/tests/build/astest.jar"/>
 
   <path id="astest.taskdef.classpath">
@@ -17,9 +17,9 @@
     <pathelement location="${jboss.home}/lib/trove.jar"/>
     <pathelement location="."/>
 
-    <fileset dir="${product.dir}/install/lib" includes="**/*" />
-    <fileset dir="${product.dir}/qa/tests/build" includes="**/*" />
-    <fileset dir="${product.dir}/qa/ext" includes="**/*" />
+    <fileset dir="${product.dir}/lib" includes="**/*" />
+    <fileset dir="${product.dir}/../../tests/build" includes="**/*" />
+    <fileset dir="${product.dir}/../../ext" includes="**/*" />
   </path>
 
   <property name="node0" value="localhost" />