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

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

Author: kabir.khan at jboss.com
Date: 2007-04-24 13:55:13 -0400 (Tue, 24 Apr 2007)
New Revision: 62518

Modified:
   projects/aop/trunk/aop/build-tests-jdk14.xml
Log:
nameddoman test should be in precompiled-genadvior-tests target, and not in non-optimized-precompiled-tests

Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml	2007-04-24 17:53:45 UTC (rev 62517)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml	2007-04-24 17:55:13 UTC (rev 62518)
@@ -95,7 +95,7 @@
          <path refid="xdoclet.xdoclet.classpath"/>
        </path>
 
-      <!-- 
+      <!--
             Settable in local.properties:
                -jrockit.home: location of JRockit JVM
                -jdk14.executable: Full path to a JDK 1.4 java.exe (Needed for the JDK 1.4 tests)
@@ -103,7 +103,7 @@
                -debug: if set, -Djboss.aop.debug.classes=true for the tests; otherwise it is false
        -->
       <property file="local.properties"/>
-      
+
       <condition property="jboss.aop.debug.classes" value="true">
          <isset property="debug"/>
       </condition>
@@ -506,10 +506,6 @@
          <param name="caller" value="non-optimized-precompiled-tests"/>
          <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/>
       </antcall>
-      <antcall target="_run-precompiled-test" inheritRefs="true">
-         <param name="test" value="nameddomain"/>
-         <param name="caller" value="non-optimized-precompiled-tests"/>
-      </antcall>
 
       <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
       <antcall target="_base-tests" inheritRefs="true">
@@ -519,6 +515,13 @@
 
    </target>
 
+   <target name="non-optimized-precompiled-test" depends="retroweave">
+      <antcall  target="_run-precompiled-test" inheritRefs="true">
+         <param name="test" value="${test}"/>
+         <param name="caller" value="non-optimized-precompiled-tests"/>
+      </antcall>
+   </target>
+
    <!-- ==================================================================================== -->
    <!-- JDK 1.4 GENERATED ADVISOR PRECOMPILED TESTS                                          -->
    <!-- ==================================================================================== -->
@@ -553,16 +556,20 @@
          <param name="caller" value="precompiled-genadvisor-tests"/>
          <param name="exclude" value="**/OverrideTestCase.class"/>
       </antcall>
+      <antcall target="_run-bootclasspath-test" inheritRefs="true">
+         <param name="test" value="nameddomain"/>
+         <param name="caller" value="precompiled-genadvisor-tests"/>
+      </antcall>
    </target>
 
-   <target name="precompiled-test" depends="init">
+   <target name="precompiled-test" depends="retroweave">
       <antcall  target="_run-precompiled-test" inheritRefs="true">
          <param name="test" value="${test}"/>
          <param name="caller" value="precompiled-tests"/>
       </antcall>
    </target>
 
-   <target name="precompiled-genadvisor-test" depends="init">
+   <target name="precompiled-genadvisor-test" depends="retroweave">
       <antcall target="_run-precompiled-test" inheritRefs="true">
          <param name="test" value="args"/>
          <param name="caller" value="precompiled-genadvisor-tests"/>