[jboss-cvs] JBossAS SVN: r88434 - projects/aop/branches/Branch_2_1/aop.

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

Author: flavia.rainone at jboss.com
Date: 2009-05-08 10:01:36 -0400 (Fri, 08 May 2009)
New Revision: 88434

Modified:
   projects/aop/branches/Branch_2_1/aop/2.0.x-compliance-tests.xml
Log:
[JBAOP-722] Removed rebuildingchain and constructortarget from precompiled_2.0.x tests (the previous version of JBoss AOP lacks the bug fix and will break if used to run with those tests).

Modified: projects/aop/branches/Branch_2_1/aop/2.0.x-compliance-tests.xml
===================================================================
--- projects/aop/branches/Branch_2_1/aop/2.0.x-compliance-tests.xml	2009-05-08 13:37:24 UTC (rev 88433)
+++ projects/aop/branches/Branch_2_1/aop/2.0.x-compliance-tests.xml	2009-05-08 14:01:36 UTC (rev 88434)
@@ -644,9 +644,16 @@
       <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor">
          <equals arg1="${caller}" arg2="precompiled-genadvisor-tests_2.0.x"/>
       </condition>
+      <condition property="newtest" value="nonexistent" else="${test}">
+         <or>
+            <equals arg1="${test}" arg2="rebuildingchain"/>
+            <equals arg1="${test}" arg2="constructortarget"/>
+         </or>
+      </condition>
 
-      <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
 
+      <echo>Compiling ${newtest} with optimized=${optimized} and instrumentor ${instrumentor}</echo>
+
       <!-- aopc -->
       <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="aopc.task.classpath.2.0.x"/>
       <aopc optimized="${optimized}" compilerclasspathref="aopc.task.classpath.2.0.x">
@@ -656,7 +663,7 @@
          <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/>
          <sysproperty key="java.io.tmpdir" value="${aopc.tmpdir}"/>
          <src path="${build.tests.classes}"/>
-         <include name="org/jboss/test/aop/${test}/**"/>
+         <include name="org/jboss/test/aop/${newtest}/**"/>
          <exclude name="org/jboss/test/aop/rebuildingchain/**,${exclude}"/>
          <aopclasspath path="${build.tests.classes}/org/jboss/test/aop/${test}"/>
       </aopc>
@@ -710,6 +717,8 @@
                <include name="org/jboss/test/aop/${test}/**/*Tester.class"/>
                <exclude name="${exclude}"/>
                <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase -->
+               <exclude name="org/jboss/test/aop/rebuildingchain/*.class"/>
+               <exclude name="org/jboss/test/aop/constructortarget/*.class"/>
                <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/>
                <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/>