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

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

Author: kabir.khan at jboss.com
Date: 2008-09-23 10:34:03 -0400 (Tue, 23 Sep 2008)
New Revision: 78787

Modified:
   projects/aop/trunk/aop/base-tests.xml
   projects/aop/trunk/aop/build-tests-jdk50.xml
Log:
[JBAOP-650] annotationProperty tests should only be run with loadtime weaving

Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml	2008-09-23 14:08:49 UTC (rev 78786)
+++ projects/aop/trunk/aop/base-tests.xml	2008-09-23 14:34:03 UTC (rev 78787)
@@ -111,11 +111,6 @@
          <param name="test" value="introduction"/>
          <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/>
       </antcall>
-      <antcall target="${test-target}" inheritRefs="true">
-         <param name="test" value="annotationproperty"/>
-         <param name="no.xml" value="true"/>
-         <param name="use.annotations" value="false"/>
-      </antcall>
    </target>
 
    <target name="help">

Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml	2008-09-23 14:08:49 UTC (rev 78786)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml	2008-09-23 14:34:03 UTC (rev 78787)
@@ -367,6 +367,13 @@
          <param name="caller" value="javaagent-tests"/>
       </antcall>
 
+      <!-- Only run this with loadtime weaving -->
+      <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="annotationproperty"/>
+         <param name="no.xml" value="true"/>
+         <param name="caller" value="javaagent-tests"/>
+      </antcall>
+
       <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-jdk50-tests" inheritRefs="true">
          <param name="caller" value="javaagent-tests"/>
@@ -430,9 +437,14 @@
          <param name="no.xml" value="true"/>
          <param name="use.annotations" value="true"/>
       </antcall>
+      <!-- Only run this with loadtime weaving -->
+      <antcall target="_run-javaagent-test" inheritRefs="true">
+         <param name="test" value="annotationproperty"/>
+         <param name="no.xml" value="true"/>
+         <param name="caller" value="javaagent-genadvisor-tests"/>
+      </antcall>
 
 
-
       <!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-jdk50-tests" inheritRefs="true">
          <param name="caller" value="javaagent-genadvisor-tests"/>