[jboss-cvs] JBossAS SVN: r57773 - projects/aop/trunk/aop
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Oct 22 19:38:57 EDT 2006
Author: kabir.khan at jboss.com
Date: 2006-10-22 19:38:54 -0400 (Sun, 22 Oct 2006)
New Revision: 57773
Modified:
projects/aop/trunk/aop/base-tests.xml
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
Log:
Add a _base-jdk50-tests target to build-tests-jdk50.xml and invoke the bridgemethod test from there. Exclude the proxy test from the woven tests
Modified: projects/aop/trunk/aop/base-tests.xml
===================================================================
--- projects/aop/trunk/aop/base-tests.xml 2006-10-22 17:10:26 UTC (rev 57772)
+++ projects/aop/trunk/aop/base-tests.xml 2006-10-22 23:38:54 UTC (rev 57773)
@@ -45,7 +45,7 @@
</antcall>
<antcall target="${test-target}" inheritRefs="true">
<param name="test" value="reflection"/>
- </antcall>
+ </antcall>
<antcall target="${test-target}" inheritRefs="true">
<param name="test" value="regression"/>
</antcall>
@@ -70,9 +70,6 @@
<antcall target="${test-target}" inheritRefs="true">
<param name="test" value="field"/>
</antcall>
- <antcall target="${test-target}" inheritRefs="true">
- <param name="test" value="bridgemethod"/>
- </antcall>
<!-- Tests with special requirements for parameters -->
<antcall target="${test-target}" inheritRefs="true">
@@ -85,9 +82,9 @@
<param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/>
</antcall>
</target>
-
+
<target name="help">
<echo message="The project fragment which executes the main tests"/>
</target>
-
+
</project>
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2006-10-22 17:10:26 UTC (rev 57772)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2006-10-22 23:38:54 UTC (rev 57773)
@@ -101,7 +101,7 @@
<available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/>
- <fail unless="jdk14.executable">Need to set jdk14.executable to a jdk 1.4 executable in local.properties. For example
+ <fail unless="jdk14.executable">Need to set jdk14.executable to a jdk 1.4 executable in local.properties. For example
jdk14.executable=C:/Java/jdk14/bin/java.exe
</fail>
<property name="java14" value="${jdk14.executable}"/>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2006-10-22 17:10:26 UTC (rev 57772)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2006-10-22 23:38:54 UTC (rev 57773)
@@ -289,13 +289,26 @@
<antcall target="jrockit-genadvisor-tests" inheritRefs="true"/>
</target>
+ <target name="_base-jdk50-tests">
+ <antcall target="${test-target}" inheritRefs="true">
+ <param name="test" value="bridgemethod"/>
+ <param name="caller" value="${caller}"/>
+ <param name="exclude" value="**/notwoven/BridgeMethodTestCase.class"/>
+ </antcall>
+ <antcall target="_base-tests" inheritRefs="true">
+ <param name="caller" value="${caller}"/>
+ <param name="test-target" value="${test-target}"/>
+ </antcall>
+ </target>
+
+
<!-- ==================================================================================== -->
<!-- JAVAAGENT TESTS (JDK 5.0) -->
<!-- ==================================================================================== -->
<target name="javaagent-tests" depends="compile-test-classes">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="javaagent-tests"/>
<param name="test-target" value="_run-javaagent-test"/>
</antcall>
@@ -323,7 +336,7 @@
<target name="javaagent-genadvisor-tests" depends="compile-test-classes">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="javaagent-genadvisor-tests"/>
<param name="test-target" value="_run-javaagent-test"/>
</antcall>
@@ -427,7 +440,7 @@
</path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="precompiled-tests"/>
<param name="test-target" value="_run-precompiled-test"/>
</antcall>
@@ -459,7 +472,7 @@
</path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="non-optimized-precompiled-tests"/>
<param name="test-target" value="_run-precompiled-test"/>
</antcall>
@@ -485,7 +498,7 @@
</path>
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="precompiled-genadvisor-tests"/>
<param name="test-target" value="_run-precompiled-test"/>
</antcall>
@@ -1100,7 +1113,7 @@
<target name="jrockit-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="jrockit-tests"/>
<param name="test-target" value="_run-jrockit-test"/>
</antcall>
@@ -1120,7 +1133,7 @@
<target name="jrockit-genadvisor-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE">
<!-- Add tests in _base-tests unless they should only be run in this weaving mode -->
- <antcall target="_base-tests" inheritRefs="true">
+ <antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="jrockit-genadvisor-tests"/>
<param name="test-target" value="_run-jrockit-test"/>
</antcall>
More information about the jboss-cvs-commits
mailing list