[jboss-cvs] JBossAS SVN: r64000 - in projects/aop/trunk: build and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 12 13:35:45 EDT 2007
Author: kabir.khan at jboss.com
Date: 2007-07-12 13:35:45 -0400 (Thu, 12 Jul 2007)
New Revision: 64000
Modified:
projects/aop/trunk/aop/build-tests-jdk14.xml
projects/aop/trunk/aop/build-tests-jdk50.xml
projects/aop/trunk/aop/build.xml
projects/aop/trunk/build/build-release.xml
Log:
Fix the tests by temporarily renaming the jboss retro jars back to the way they were.
Modified: projects/aop/trunk/aop/build-tests-jdk14.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk14.xml 2007-07-12 16:46:18 UTC (rev 63999)
+++ projects/aop/trunk/aop/build-tests-jdk14.xml 2007-07-12 17:35:45 UTC (rev 64000)
@@ -178,7 +178,7 @@
<path id="jbossretrort.classpath">
<path refid="jboss/backport.concurrent.classpath"/>
- <pathelement path="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.0-rt.jar"/>
+ <pathelement path="${org/jboss/jboss.retro.lib}/jbossretro-rt.jar"/>
<path refid="jboss.microcontainer14.classpath"/>
<path refid="jboss/common.core.14.classpath"/>
</path>
Modified: projects/aop/trunk/aop/build-tests-jdk50.xml
===================================================================
--- projects/aop/trunk/aop/build-tests-jdk50.xml 2007-07-12 16:46:18 UTC (rev 63999)
+++ projects/aop/trunk/aop/build-tests-jdk50.xml 2007-07-12 17:35:45 UTC (rev 64000)
@@ -114,6 +114,7 @@
</not>
</condition>
+ <echo>Debug: ${debug}</echo>
<!-- ======= -->
<!-- Modules -->
@@ -415,9 +416,9 @@
<param name="no.xml" value="true"/>
<param name="use.annotations" value="true"/>
</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"/>
@@ -606,14 +607,14 @@
<param name="no.xml" value="true"/>
<param name="use.annotations" value="true"/>
</antcall>
-
+
<!-- This should only be run using compile-time weaving -->
<antcall target="_run-precompiled-test" inheritRefs="true">
<param name="test" value="postweavingmixins"/>
<param name="caller" value="precompiled-genadvisor-tests"/>
</antcall>
-
+
<!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode -->
<antcall target="_base-jdk50-tests" inheritRefs="true">
<param name="caller" value="precompiled-genadvisor-tests"/>
@@ -1455,7 +1456,112 @@
</junit>
</target>
+ <!-- ==================================================================================== -->
+ <!-- MEMORY TESTS (JDK 5.0) -->
+ <!-- ==================================================================================== -->
+ <target name="memory-tests" depends="compile-test-classes">
+ <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/>
+
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="annotatedcflow"/>
+ <param name="case" value="AnnotatedCFlowTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="annotatedparams"/>
+ <param name="case" value="AnnotatedParamsTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="args"/>
+ <param name="case" value="ArgsTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="basic"/>
+ <param name="case" value="AOPTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="beanstyleconfig"/>
+ <param name="case" value="ConfigTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="callerargs"/>
+ <param name="case" value="CallerArgsTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="callerscope"/>
+ <param name="case" value="CallerScopeTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="construction"/>
+ <param name="case" value="ConstructionTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="constructortarget"/>
+ <param name="case" value="ConstructorTargetTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="dotinpointcutname"/>
+ <param name="case" value="DotInPointcutNameTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="implementz"/>
+ <param name="case" value="ImplementsTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="instanceofannotated"/>
+ <param name="case" value="InstanceOfAnnotatedTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="introduction"/>
+ <param name="case" value="IntroductionTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="override"/>
+ <param name="case" value="OverrideTestCase"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="perjoinpoint"/>
+ <param name="case" value="PerJoinpointTester"/>
+ </antcall>
+ <antcall target="memory-test" inheritRefs="true">
+ <param name="test" value="scope"/>
+ <param name="case" value="ScopeTestCase"/>
+ </antcall>
+ </target>
+
+ <target name="memory-test" depends="init">
+ <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
+ <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/>
+ <property name="testcase" value="org.jboss.test.aop.${test}.${case}"/>
+
+
+ <aopc compilerclasspathref="aopc.task.classpath">
+ <classpath refid="aopc.task.classpath"/>
+ <classpath path="${build.tests.classes}"/>
+ <aoppath path="${aoppath}"/>
+ <src path="${build.tests.classes}"/>
+ <include name="org/jboss/test/aop/${test}/**"/>
+ <aopclasspath path="${build.tests.classes}"/>
+ </aopc>
+
+ <property name="report.dir" value="${build.reports}"/>
+ <mkdir dir="${report.dir}/memory-tests"/>
+
+ <echo>${testcase}</echo>
+ <junit printsummary="yes" fork="yes" haltonfailure="no">
+ <sysproperty key="jboss.aop.path" value="${aoppath}"/>
+ <sysproperty key="test.to.run" value="${testcase}"/>
+ <sysproperty key="leak.report.dir" value="${report.dir}"/>
+ <classpath refid="test.classpath"/>
+ <classpath path="${build.tests.classes}"/>
+ <jvmarg value="-agentlib:jbossAgent"/>
+ <formatter usefile="true" type="xml" extension="-${testcase}.xml"/>
+ <formatter usefile="true" type="plain" extension="-${testcase}.txt"/>
+ <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTestCase" todir="${report.dir}"/>
+ </junit>
+ </target>
+
+
<target name="compiletime-declare" depends="compile-test-classes">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/>
<taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aopc.classpath"/>
Modified: projects/aop/trunk/aop/build.xml
===================================================================
--- projects/aop/trunk/aop/build.xml 2007-07-12 16:46:18 UTC (rev 63999)
+++ projects/aop/trunk/aop/build.xml 2007-07-12 17:35:45 UTC (rev 64000)
@@ -176,6 +176,11 @@
<!-- Packages to include when generating api documentation -->
<property name="javadoc.packages" value="org.jbos.aop.*"/>
+
+ <!-- TEMPORARY HACK TO RENAME THE NEW JBOSS RETRO JARS TO THE WAY THEY WERE, WITHOUT STUPID VERSION NUMBERS -->
+ <copy file="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1.jar" tofile="${org/jboss/jboss.retro.lib}/jbossretro.jar"/>
+ <copy file="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1-rt.jar" tofile="${org/jboss/jboss.retro.lib}/jbossretro-rt.jar"/>
+
</target>
Modified: projects/aop/trunk/build/build-release.xml
===================================================================
--- projects/aop/trunk/build/build-release.xml 2007-07-12 16:46:18 UTC (rev 63999)
+++ projects/aop/trunk/build/build-release.xml 2007-07-12 17:35:45 UTC (rev 64000)
@@ -119,8 +119,11 @@
<property name="jboss-logging-spi.location" value="${jboss/common.logging.spi.lib}/jboss-logging-spi.jar"/>
<property name="jboss-container.location" value="${jboss.microcontainer.lib}/jboss-container.jar"/>
<property name="jboss-container14.location" value="${jboss.microcontainer14.lib}/jboss-container14.jar"/>
- <property name="jbossretro.location" value="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1.jar"/>
- <property name="jbossretro-rt.location" value="${org/jboss/jboss.retro.lib}/jboss-retro-1.1.1-rt.jar"/>
+
+ <!-- Use the "old" jboss retro names, see "hack" in aop/build.xml/configure -->
+ <property name="jbossretro.location" value="${org/jboss/jboss.retro.lib}/jbossretro.jar"/>
+ <property name="jbossretro-rt.location" value="${org/jboss/jboss.retro.lib}/jbossretro.jar"/>
+
<property name="log4j.location" value="${apache.log4j.lib}/log4j.jar"/>
<property name="qdox.location" value="${qdox.qdox.lib}/qdox.jar"/>
<property name="trove.location" value="${trove.trove.lib}/trove.jar"/>
More information about the jboss-cvs-commits
mailing list