[jboss-cvs] JBossAS SVN: r90262 - projects/aop/trunk/aop.

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

Author: flavia.rainone at jboss.com
Date: 2009-06-16 13:08:00 -0400 (Tue, 16 Jun 2009)
New Revision: 90262

Modified:
   projects/aop/trunk/aop/2.0.x-compliance-tests.xml
Log:
[JBAOP-735] Script fixed part II. The 2.0.x-compliance-tests.xml script didn't take into account that _run-precompiled-test_2.0.x could be called by the non-optimized-precompiled-tests_2.0.x target.

Modified: projects/aop/trunk/aop/2.0.x-compliance-tests.xml
===================================================================
--- projects/aop/trunk/aop/2.0.x-compliance-tests.xml	2009-06-16 16:32:38 UTC (rev 90261)
+++ projects/aop/trunk/aop/2.0.x-compliance-tests.xml	2009-06-16 17:08:00 UTC (rev 90262)
@@ -635,8 +635,15 @@
          <equals arg1="${caller}" arg2="non-optimized-precompiled-tests_2.0.x"/>
       </condition>
       <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
-         <equals arg1="${caller}" arg2="precompiled-tests_2.0.x"/>
+         <or>
+            <equals arg1="${caller}" arg2="precompiled-tests_2.0.x"/>
+            <equals arg1="${caller}" arg2="non-optimized-precompiled-tests_2.0.x"/>
+         </or>
       </condition>
+      <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor">
+               <equals arg1="${caller}" arg2="precompiled-tests_2.0.x"/>
+            </condition>
+      
       <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
          <equals arg1="${caller}" arg2="precompiled-genadvisor-tests_2.0.x"/>
       </condition>