From: wisberg <wisberg>
Date: Wed, 11 May 2005 08:58:25 +0000 (+0000)
Subject: not using junitModules.xml
X-Git-Tag: PRE_ANDY~346
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=1198dea5bd7f7c03263805773bbce3bc21f8c715;p=aspectj.git

not using junitModules.xml
---

diff --git a/build/release/build.xml b/build/release/build.xml
index c2846f6d6..eb41713b7 100644
--- a/build/release/build.xml
+++ b/build/release/build.xml
@@ -26,7 +26,6 @@
    test
      test-sources             # - requires only sources
        test-harness-tests     # run tests/{suite}.xml's
-       test-junit-modules     # tests/junitModules.xml
      test-install             # - requires distribution
        test-build-examples    # install/docs/examples
        test-ajc-aspectj       # ajc compiles aspectj
@@ -444,25 +443,25 @@
 	</target>
 
 	<target name="test-junit-modules" 
-		depends="init-variables,init-junitTests-available">
+		depends="init-variables">	    
+		
 		<antcall target="do-run-ant">
-			<param name="run.ant.file" value="junitModules.xml"/>
-			<param name="ant.target" value="test-all"/>
+			<param name="run.ant.file" value="newbuild.xml"/>
+			<param name="ant.target" value="test"/>
 			<param name="ant.dir" 
-				location="${aspectj.modules.dir}/tests"/>
+				location="${aspectj.modules.dir}/run-all-junit-tests"/>
 			<param name="ant.output" 
-				location="${aj.build.log.dir}/test-junitModules"/>
+				location="${aj.build.log.dir}/test-run-all-junit-tests"/>
 		</antcall>
-		
 		<property file="${java.home.file}"/>
 		<property name="tjm.copy.todir"
-			location="${aj.build.log.dir}/junitXmlOutput-${build.java.version}"/>
+			location="${aj.build.log.dir}/test-run-all-junit-tests-${build.java.version}"/>
 		<mkdir dir="${tjm.copy.todir}"/>
 		<delete quiet="on">
 			<fileset dir="${tjm.copy.todir}" includes="**/*"/>
 		</delete>
 		<property name="xmlSrcDir"
-			location="${aspectj.tests.dir}/bin/junitXmlOutput"/>
+			location="${aj.build.dir}/junit/run-all-junit-tests"/>
 		<move todir="${tjm.copy.todir}" >
 		 	<fileset dir="${xmlSrcDir}"	includes="**/*"/>
 		</move>
@@ -722,7 +721,7 @@
 			<sysproperty key="ANT_HOME" 
 				path="${aspectj.ant.home}"/>
 
-			<!-- for tests/junitModules.xml -->
+			<!-- for ajde -->
 			<sysproperty key="aspectjrt.path"
 				file="${aj.build.install.dir}/lib/aspectjrt.jar"/>
 			<sysproperty key="test.classpath"
diff --git a/build/release/readme.txt b/build/release/readme.txt
index 455783aab..035895ac1 100644
--- a/build/release/readme.txt
+++ b/build/release/readme.txt
@@ -49,6 +49,7 @@ sp="-Dskip.cvs=true -Daspectj.modules.dir=../.."
 sp="${sp} -Djava13.home=c:/home/apps/jdk13"
 sp="${sp} -Djava14.home=c:/home/apps/jdk14"
 sp="${sp} -Djava15.home=c:/home/apps/jdk15"
+#sp="${sp} -Drun.14.only=true"
 
 #alias myant="$scriptDir/../../lib/ant/bin/ant"
 myant="$scriptDir/../../lib/ant/bin/ant"