From: Kabir K. <kk...@jb...> - 2006-07-04 17:03:39
|
User: kkhan Date: 06/07/04 13:03:37 Modified: jboss-aop build.xml Log: Add AOP utility class for creating method hashes from the MC classinfo stuff Revision Changes Path 1.150 +28 -32 jboss-aop/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build.xml,v retrieving revision 1.149 retrieving revision 1.150 diff -u -b -r1.149 -r1.150 --- build.xml 30 Jun 2006 20:31:49 -0000 1.149 +++ build.xml 4 Jul 2006 17:03:37 -0000 1.150 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.149 2006/06/30 20:31:49 bdecoste Exp $ --> +<!-- $Id: build.xml,v 1.150 2006/07/04 17:03:37 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -623,7 +623,7 @@ <antcall target="bootclasspath-genadvisor-tests" inheritRefs="true"/> <antcall target="bootclasspath-tests" inheritRefs="true"/> <antcall target="system-classloader-test" inheritRefs="true"/> - <antcall target="proxy-test" inheritRefs="true"/> + <antcall target="not-woven-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="jrockit-loadtime-tests" inheritRefs="true"/> @@ -702,7 +702,6 @@ <classpath path="${build.tests.classes}"/> <src path="${source.tests.java}"/> <include name="org/jboss/test/aop/annotatedcflow/*.java"/> - <include name="org/jboss/test/aop/annotationc/*.java"/> <include name="org/jboss/test/aop/annotatedparams/*.java"/> <include name="org/jboss/test/aop/perjoinpoint/*.java"/> <include name="org/jboss/test/aop/annotated/*.java"/> @@ -778,11 +777,6 @@ <param name="test" value="introduction"/> <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/> </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="no.xml" value="true"/> - <param name="test" value="annotationc"/> - </antcall> - </target> <target name="loadtime-test" depends="init"> @@ -970,7 +964,6 @@ <classpath path="${build.tests.classes}"/> <src path="${source.tests.java}"/> <include name="org/jboss/test/aop/annotatedcflow/*.java"/> - <include name="org/jboss/test/aop/annotationc/*.java"/> <include name="org/jboss/test/aop/annotatedparams/*.java"/> <include name="org/jboss/test/aop/perjoinpoint/*.java"/> <include name="org/jboss/test/aop/annotated/*.java"/> @@ -1167,10 +1160,22 @@ <!-- ==================================================================================== --> - <!-- PROXY TEST --> + <!-- NON-WOVEN TESTS --> <!-- ==================================================================================== --> - <target name="proxy-test" depends="compile-test-classes"> + <target name="not-woven-tests" depends="compile-test-classes"> + <mkdir dir="${build.reports}"/> + + <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> + <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> + <classpath refid="aop.task.classpath"/> + <classpath path="${build.tests.classes}"/> + <src path="${source.tests.java}"/> + <include name="org/jboss/test/aop/annotationc/*.java"/> + </annotationc> + + <echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo> + <junit printsummary="yes" fork="no" haltonfailure="no" > <classpath> <path refid="test.classpath"/> @@ -1179,7 +1184,18 @@ </classpath> <formatter type="plain"/> <formatter type="xml"/> - <test fork="yes" name="org.jboss.test.aop.proxy.ProxyTestCase" todir="${build.reports}"/> + + <batchtest todir="${build.reports}" + haltonerror="false" + haltonfailure="false" + fork="true"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/proxy/ProxyTestCase.class"/> + <include name="org/jboss/test/aop/methodhashing/MethodHashingTestCase.class"/> + <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/> + </fileset> + </batchtest> + </junit> </target> @@ -1701,14 +1717,6 @@ <property name="report.dir" value="${build.reports}/jroockit-loadtime-tests"/> <mkdir dir="${report.dir}"/> - <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> - <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> - <classpath refid="aop.task.classpath"/> - <classpath path="${build.tests.classes}"/> - <src path="${source.tests.java}"/> - <include name="org/jboss/test/aop/annotationc/*.java"/> - </annotationc> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> <sysproperty key="verbose" value="true"/> @@ -1785,17 +1793,6 @@ <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.ejbthree315.UnderscoreMethodTester"/> <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop137.ExtenderTestCase"/> </junit> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <classpath> - <path refid="test.jrockit.classpath"/> - <pathelement location="${build.tests.classes}"/> - <pathelement location="docs"/> - </classpath> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.annotationc.AnnotationTester"/> - </junit> </target> <target name="compiletime-declare" depends="compile-test-classes"> @@ -1970,7 +1967,6 @@ <classpath path="${build.tests.classes}"/> <src path="${source.tests.java}"/> <include name="org/jboss/test/aop/annotatedcflow/*.java"/> - <include name="org/jboss/test/aop/annotationc/*.java"/> <include name="org/jboss/test/aop/annotatedparams/*.java"/> <include name="org/jboss/test/aop/perjoinpoint/*.java"/> <include name="org/jboss/test/aop/annotated/*.java"/> |