Merge pull request #143 from renfeiw/tkg

Update testKitGen
eclipse-openj9 · Sep 26, 2017 · 2ef347c · 2ef347c
2 parents 61ff3e4 + 487047a
commit 2ef347c
Show file tree

Hide file tree

Showing 70 changed files with 290 additions and 434 deletions.
diff --git a/test/IllegalAccessError_for_protected_method/build.xml b/test/IllegalAccessError_for_protected_method/build.xml
@@ -30,15 +30,14 @@
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/IllegalAccessError_for_protected_method" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
 	<property name="build" location="./bin" />
 	<property name="transformerListener" location="../Utils/src"/>
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
@@ -48,7 +47,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 		<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
 			<src path="${src}" />
 			<classpath>
@@ -59,15 +58,13 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution" >
-		<jar jarfile="${dist}/IllegalAccessProtectedMethod.jar" filesonly="true" manifest="./Manifest.mf" >
+		<jar jarfile="${DEST}/IllegalAccessProtectedMethod.jar" filesonly="true" manifest="./Manifest.mf" >
 			<fileset dir="${build}"/>
 			<fileset dir="${src}"/>
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/InstrumentationAgent/build.xml b/test/InstrumentationAgent/build.xml
@@ -31,14 +31,13 @@
 	<!-- set global properties for this build -->
 	<property name="BUILD_ROOT" value="../" />
 	<property name="DEST" value="${BUILD_ROOT}/InstrumentationAgent" />
-	<property name="dist" location="${DEST}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
 	<property name="build" location="./bin" />
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
@@ -48,7 +47,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 				<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
 					<src path="${src}" />
 				</javac>

diff --git a/test/JIT_Test/build.xml b/test/JIT_Test/build.xml
@@ -30,15 +30,14 @@
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/JIT_Test" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
 	<property name="build" location="./bin" />
 	<property name="transformerListener" location="../Utils/src" />
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
@@ -48,7 +47,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 		<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
 			<src path="${src}" />
 			<src path="${transformerListener}" />
@@ -63,14 +62,12 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution">
-		<jar jarfile="${dist}/jitt.jar" filesonly="true">
+		<jar jarfile="${DEST}/jitt.jar" filesonly="true">
 			<fileset dir="${build}" />
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/JLM_Tests/build.xml b/test/JLM_Tests/build.xml
@@ -33,7 +33,6 @@
 	<property name="BUILDINFO_FSROOT" value="${BUILD_ROOT}" />
 	<property name="DEST" value="${BUILD_ROOT}/JLM_Tests" />
 
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 	<property name="src" location="./src" />
 	<property name="src_80" location="./src_80" />
 	<property name="src_90" location="./src_90" />
@@ -42,7 +41,7 @@
 
 	<target name="init">
 		<fail message="BUILD_ROOT must be defined." unless="BUILD_ROOT" />
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
@@ -94,16 +93,14 @@
 
 	<target name="dist" depends="compile" description="generate the distribution">
 		<!-- Store all class files in jlm-tests.jar file. -->
-		<mkdir dir="${dist}"/>
-		<jar jarfile="${dist}/jlm_tests.jar" filesonly="true">
+		<mkdir dir="${DEST}"/>
+		<jar jarfile="${DEST}/jlm_tests.jar" filesonly="true">
 			<fileset dir="${build}"/>
 			<fileset dir="${src}"/>
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/Java8andUp/build.xml b/test/Java8andUp/build.xml
@@ -31,7 +31,6 @@
 	<!-- set global properties for this build -->
 	<property name="BUILD_ROOT" value="../" />
 	<property name="DEST" value="${BUILD_ROOT}/Java8andUp" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
@@ -42,7 +41,7 @@
 	<property name="transformerListener" location="../Utils/src"/>
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 		<mkdir dir="${build_resource}" />
 	</target>
@@ -125,7 +124,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 		<if>
 			<equals arg1="${JAVA_VERSION}" arg2="SE90"/>
 			<then>
@@ -253,20 +252,18 @@
 	</target>
 
 	<target name="dist" depends="pack_resources" description="generate the distribution">
-		<jar jarfile="${dist}/GeneralTest.jar" filesonly="true">
+		<jar jarfile="${DEST}/GeneralTest.jar" filesonly="true">
 			<fileset dir="${build}" />
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<jar jarfile="${dist}/TestResources.jar" filesonly="true">
+		<jar jarfile="${DEST}/TestResources.jar" filesonly="true">
 			<fileset dir="${build_resource}" />
 		</jar>
 		<jar jarfile="${RESOURCES_DIR}/vmargs.jar" filesonly="true" manifest="./META-INF/MANIFEST.MF">
 			<fileset dir="${build}" includes="org/openj9/test/vmArguments/*.class"/>
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml,*.policy" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml,*.policy" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/Java9andUp/build.xml b/test/Java9andUp/build.xml
@@ -31,7 +31,6 @@
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/Java9andUp" />
 	<property name="BUILDINFO_FSROOT" value="${BUILD_ROOT}" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src"/>
@@ -44,7 +43,7 @@
 	<property name="target.level" value="1.9"/> -->
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}"/>
 	</target>
 
@@ -54,7 +53,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 
 		<if>
 			<equals arg1="${JCL_VERSION}" arg2="current"/>
@@ -86,15 +85,13 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution" >
-		<mkdir dir="${dist}"/>
-		<jar jarfile="${dist}/GeneralTest.jar" filesonly="true">
+		<mkdir dir="${DEST}"/>
+		<jar jarfile="${DEST}/GeneralTest.jar" filesonly="true">
 			<fileset dir="${build}"/>
 			<fileset dir="${src}/../" includes="*.properties,*.xml"/>
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/JavaAgentTest/build.xml b/test/JavaAgentTest/build.xml
@@ -31,20 +31,19 @@
 	<!-- set global properties for this build -->
 	<property name="BUILD_ROOT" value="../" />
 	<property name="DEST" value="${BUILD_ROOT}/JavaAgentTest" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 	<property name="src" location="./src"/>
 	<property name="build" location="./bin"/>
 	<property name="transformerListener" location="../Utils/src"/>
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
 	<target name="compile" depends="init" description="compile the source " >
 		<echo>===Ant version: ${ant.version}</echo>
 		<echo>===executable:			${compiler.javac}</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 		<if>
 			<equals arg1="${JAVA_VERSION}" arg2="SE80"/>
 			<then>
@@ -75,15 +74,13 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution" >
-		<jar jarfile="${dist}/javaagenttest.jar" filesonly="true" manifest="./META-INF/MANIFEST.MF" >
+		<jar jarfile="${DEST}/javaagenttest.jar" filesonly="true" manifest="./META-INF/MANIFEST.MF" >
 			<fileset dir="${build}"/>
 			<fileset dir="${src}"/>
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
 	</target>

diff --git a/test/Jsr292/build.xml b/test/Jsr292/build.xml
@@ -30,7 +30,6 @@
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/Jsr292" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src"/>
@@ -42,7 +41,7 @@
 	<property name="transformerListener" location="../Utils/src"/>
 
 	<target name="init">
-		<mkdir dir="${dist}"/>
+		<mkdir dir="${DEST}"/>
 		<mkdir dir="${build}"/>
 		<mkdir dir="${bootstrapBuild}"/>
 	</target>
@@ -206,16 +205,14 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution" >
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml,*.policy" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml,*.policy" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>
-		<jar jarfile="${dist}/jsr292test.jar" filesonly="true">
+		<jar jarfile="${DEST}/jsr292test.jar" filesonly="true">
 			<fileset dir="${build}"/>
 		</jar>
-		<jar jarfile="${dist}/jsr292bootstrap.jar" filesonly="true">
+		<jar jarfile="${DEST}/jsr292bootstrap.jar" filesonly="true">
 			<fileset dir="${bootstrapBuild}"/>
 		</jar>
 	</target>

diff --git a/test/Jsr335/build.xml b/test/Jsr335/build.xml
@@ -30,15 +30,14 @@
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/Jsr335" />
-	<property name="dist" location="${DEST}/${JAVA_VERSION}" />
 
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
 	<property name="build" location="./bin" />
 	<property name="transformerListener" location="../Utils/src"/>
 
 	<target name="init">
-		<mkdir dir="${dist}" />
+		<mkdir dir="${DEST}" />
 		<mkdir dir="${build}" />
 	</target>
 
@@ -48,7 +47,7 @@
 		<echo>===fork:				yes</echo>
 		<echo>===executable:			${compiler.javac}</echo>
 		<echo>===debug:				on</echo>
-		<echo>===destdir:				${dist}</echo>
+		<echo>===destdir:				${DEST}</echo>
 		<javac srcdir="${src}" destdir="${build}" debug="true" fork="true" executable="${compiler.javac}" includeAntRuntime="false" encoding="ISO-8859-1">
 			<src path="${src}" />
 			<src path="${transformerListener}" />
@@ -62,14 +61,12 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution">
-		<jar jarfile="${dist}/Jsr335.jar" filesonly="true">
+		<jar jarfile="${DEST}/Jsr335.jar" filesonly="true">
 			<fileset dir="${build}" />
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
-		<copy todir="${dist}">
-			<fileset dir="${src}/../" includes="*.xml" />
-		</copy>
 		<copy todir="${DEST}">
+			<fileset dir="${src}/../" includes="*.xml" />
 			<fileset dir="${src}/../" includes="*.mk" />
 		</copy>