[jboss-cvs] JBossAS SVN: r71635 - branches/JBPAPP_4_2_0_GA_CP/testsuite.

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

Author: dbhole
Date: 2008-04-02 17:00:28 -0400 (Wed, 02 Apr 2008)
New Revision: 71635

Modified:
   branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
Log:

Update testsuite build.xml to make it honour values in build/build.properties



Modified: branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-04-02 20:26:52 UTC (rev 71634)
+++ branches/JBPAPP_4_2_0_GA_CP/testsuite/build.xml	2008-04-02 21:00:28 UTC (rev 71635)
@@ -14,6 +14,10 @@
 
 <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server">
 
+  <!-- build.properties file sets version and other flags that must override 
+       things in version-info.xml and buildmagic.ent -->
+  <property file="../build/build.properties"/>
+
   <import file="../tools/etc/buildmagic/build-common.xml"/>
 
   <!-- Targets for integration tests -->
@@ -98,7 +102,10 @@
 
   <!-- For backward compatibility, support the jbosstest.useJBM switch for now -->
   <condition property="jbosstest.test.soa" value="true">
-    <isset property="jbosstest.useJBM"/>
+    <or>
+      <isset property="jbosstest.useJBM"/>
+      <equals arg1="${build.soa}" arg2="true"/>
+    </or>
   </condition>
 
   <!-- define jbossws classpath explicitly because jbossws/lib contains other integration layers as well -->