Merge pull request #13419 from renfeiw/playlist2

Update command line tests compilation dependency
eclipse-openj9 · Sep 2, 2021 · 0ce58fe · 0ce58fe
2 parents ed2ff6c + 52a05e3
commit 0ce58fe
Show file tree

Hide file tree

Showing 78 changed files with 410 additions and 159 deletions.
diff --git a/test/functional/CacheManagement/build.xml b/test/functional/CacheManagement/build.xml
@@ -27,7 +27,7 @@
 		Build CacheManagement Tests 
 	</description>
 	<import file="${TEST_ROOT}/functional/build.xml"/>
-	
+
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/CacheManagement" />
 	<property name="src" location="./src"/>

diff --git a/test/functional/JIT_Test/build.xml b/test/functional/JIT_Test/build.xml
@@ -35,6 +35,7 @@
 	<!--Properties for this particular build-->
 	<property name="src" location="./src" />
 	<property name="build" location="./bin" />
+	<property name="jarfile" value="${DEST}/jitt.jar" />
 	<property name="transformerListener" location="${TEST_ROOT}/Utils/src" />
 	<property name="LIB" value="jcommander,testng"/>
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
@@ -65,7 +66,7 @@
 	</target>
 
 	<target name="dist" depends="compile" description="generate the distribution">
-		<jar jarfile="${DEST}/jitt.jar" filesonly="true">
+		<jar jarfile="${jarfile}" filesonly="true">
 			<fileset dir="${build}" />
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
 		</jar>
@@ -80,7 +81,11 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="check-jar">
+		<available file="${jarfile}" property="jar.exist"/>
+	</target>
+
+	<target name="build" depends="check-jar" unless="jar.exist">
 		<antcall target="clean" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/VM_Test/build.xml b/test/functional/VM_Test/build.xml
@@ -33,6 +33,7 @@
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/VM_Test" />
+	<property name="jarfile" value="${DEST}/VM_Test.jar" />
 	<property name="excludeFiles" location="../J9 Exclude File Support/src"/>
 	<property name="data" location="./data" />
 	<property name="databin" location="./data/bin" />
@@ -171,7 +172,7 @@
 		<jar jarfile="${databin}/JarFileUpdateTestRunnerResource2.jar" filesonly="true" manifest="./META-INF/MANIFEST.MF">
 			<fileset dir="${databin}/JarFileUpdateTestRunnerResource2"/>
 		</jar>
-		<jar jarfile="${DEST}/VM_Test.jar" filesonly="true" manifest="./META-INF/MANIFEST.MF">
+		<jar jarfile="${jarfile}" filesonly="true" manifest="./META-INF/MANIFEST.MF">
 			<fileset dir="${build}" />
 			<fileset dir="${excludeFiles}"/>
 			<fileset dir="${src}/../" includes="*.properties,*.xml" />
@@ -204,7 +205,11 @@
 		<delete dir="${classUnloadingBin}" />
 	</target>
 
-	<target name="build" >
+	<target name="check-jar">
+		<available file="${jarfile}" property="jar.exist"/>
+	</target>
+
+	<target name="build" depends="check-jar" unless="jar.exist">
 		<if>
 			<or>
 				<equals arg1="${JDK_IMPL}" arg2="ibm"  />

diff --git a/test/functional/cmdLineTests/CDSAdaptorTest/build.xml b/test/functional/cmdLineTests/CDSAdaptorTest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2001, 2020 IBM Corp. and others
+  Copyright (c) 2001, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build CDSAdaptorTest 
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/CDSAdaptorTest" />
 	<property name="dist" location="${DEST}"/>
@@ -102,7 +104,7 @@
 		<delete dir="${build_resource_weavinghookTest}" />
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<if>
 			<or>
 				<equals arg1="${JDK_IMPL}" arg2="ibm"  />

diff --git a/test/functional/cmdLineTests/J9security/build.xml b/test/functional/cmdLineTests/J9security/build.xml
@@ -28,6 +28,8 @@
 		Build cmdLineTests_J9security
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/J9security" />
 	<property name="PROJECT_ROOT" location="." />
@@ -105,7 +107,7 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<if>
 			<or>
 				<equals arg1="${JDK_IMPL}" arg2="ibm"  />

diff --git a/test/functional/cmdLineTests/SystemPropertiesTest/build.xml b/test/functional/cmdLineTests/SystemPropertiesTest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2020, 2020 IBM Corp. and others
+  Copyright (c) 2020, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build cmdLineTester_SystemPropertiesTest
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/SystemPropertiesTest" />
 	<property name="src" location="./src"/>
@@ -65,7 +67,7 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<antcall target="clean" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/URLClassLoaderTests/build.xml b/test/functional/cmdLineTests/URLClassLoaderTests/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2016, 2019 IBM Corp. and others
+  Copyright (c) 2016, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build DataHelperTests   
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/URLClassLoaderTests" />
 	<property name="PROJECT_ROOT" location="." />
@@ -317,7 +319,7 @@
 		<!-- Delete the ${build} directory trees -->
 		<delete dir="${build.dir}" />
 	</target>
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<antcall target="clean" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/ValueBasedClassTest/build.xml b/test/functional/cmdLineTests/ValueBasedClassTest/build.xml
@@ -28,6 +28,8 @@
 		Build cmdLineTester_ValueBasedClassTest
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/ValueBasedClassTest" />
 	<property name="src" location="./src"/>
@@ -67,7 +69,7 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<if>
 			<or>
 				<equals arg1="${JDK_IMPL}" arg2="ibm"  />

diff --git a/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml b/test/functional/cmdLineTests/bootStrapStaticVerify/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2020, 2020 IBM Corp. and others
+  Copyright (c) 2020, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build cmdLineTests bootStrapStaticVerify
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/bootStrapStaticVerify" />
 	<property name="src" location="." />
@@ -38,7 +40,7 @@
 		</copy>
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools,buildCmdLineTestUtils">
 		<antcall target="dist" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml b/test/functional/cmdLineTests/bootstrapMethodArgumentTest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2019, 2020 IBM Corp. and others
+  Copyright (c) 2019, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build bootstrapMethodArgumentTest
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/bootstrapMethodArgumentTest" />
 	<property name="src" location="./src"/>
@@ -83,7 +85,7 @@
 		</delete>
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<antcall target="clean" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/build.xml b/test/functional/cmdLineTests/build.xml
@@ -28,6 +28,7 @@
 		Build cmdLineTests
 	</description>
 	<import file="${TEST_ROOT}/functional/build.xml"/>
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
 
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests" />
@@ -36,7 +37,7 @@
 		<mkdir dir="${DEST}" />
 	</target>
 
-	<target name="build" depends="dist">
+	<target name="build" depends="dist,buildCmdLineTestTools">
 		<subant target="">
 			<fileset dir="." includes="*/build.xml" />
 		</subant>

diff --git a/test/functional/cmdLineTests/buildTools.xml b/test/functional/cmdLineTests/buildTools.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0"?>
+
+<!--
+  Copyright (c) 2021, 2021 IBM Corp. and others
+
+  This program and the accompanying materials are made available under
+  the terms of the Eclipse Public License 2.0 which accompanies this
+  distribution and is available at https://www.eclipse.org/legal/epl-2.0/
+  or the Apache License, Version 2.0 which accompanies this distribution and
+  is available at https://www.apache.org/licenses/LICENSE-2.0.
+
+  This Source Code may also be made available under the following
+  Secondary Licenses when the conditions for such availability set
+  forth in the Eclipse Public License, v. 2.0 are satisfied: GNU
+  General Public License, version 2 with the GNU Classpath
+  Exception [1] and GNU General Public License, version 2 with the
+  OpenJDK Assembly Exception [2].
+
+  [1] https://www.gnu.org/software/classpath/license.html
+  [2] http://openjdk.java.net/legal/assembly-exception.html
+
+  SPDX-License-Identifier: EPL-2.0 OR Apache-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR LicenseRef-GPL-2.0 WITH Assembly-exception
+-->
+
+<project name="cmdLineTests" default="buildCmdLineTestTools" basedir=".">
+	<target name="buildCmdLineTestTools" description="build command line test tools">
+		<subant target="build">
+			<fileset dir="${TEST_ROOT}/functional/cmdline_options_tester/" includes="build.xml" />
+			<fileset dir="${TEST_ROOT}/functional/cmdline_options_testresources/" includes="build.xml" />
+		</subant>
+	</target>
+
+	<target name="buildCmdLineTestUtils" description="build command line test utils">
+		<subant target="build">
+			<fileset dir="${TEST_ROOT}/functional/cmdLineTests/utils" includes="build.xml" />
+		</subant>
+	</target>
+
+	<target name="buildCmdLineTestUtils2" description="build command line test utils">
+		<subant target="build">
+			<fileset dir="${TEST_ROOT}/functional/cmdLineTests/utils2" includes="build.xml" />
+		</subant>
+	</target>
+</project>
diff --git a/test/functional/cmdLineTests/callsitedbgddrext/build.xml b/test/functional/cmdLineTests/callsitedbgddrext/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2018, 2018 IBM Corp. and others
+  Copyright (c) 2018, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build cmdLineTests callsitedbgddrext
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/callsitedbgddrext" />
 	<property name="src" location="." />
@@ -38,7 +40,7 @@
 		</copy>
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools,buildCmdLineTestUtils">
 		<antcall target="dist" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/classLoaderTest/build.xml b/test/functional/cmdLineTests/classLoaderTest/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2020, 2020 IBM Corp. and others
+  Copyright (c) 2020, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build cmdLineTests_EnableAssertionStatusTest
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/classLoaderTest" />
 	<property name="PROJECT_ROOT" location="." />
@@ -64,7 +66,7 @@
 		<delete dir="${build}" />
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools">
 		<antcall target="clean" inheritall="true" />
 	</target>
 </project>
diff --git a/test/functional/cmdLineTests/classesdbgddrext/build.xml b/test/functional/cmdLineTests/classesdbgddrext/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <!--
-  Copyright (c) 2017, 2018 IBM Corp. and others
+  Copyright (c) 2017, 2021 IBM Corp. and others
 
   This program and the accompanying materials are made available under
   the terms of the Eclipse Public License 2.0 which accompanies this
@@ -28,6 +28,8 @@
 		Build cmdLineTests classesddrtests
 	</description>
 
+	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
+
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/cmdLineTests/classesdbgddrext" />
 	<property name="src" location="." />
@@ -39,7 +41,7 @@
 		</copy>
 	</target>
 
-	<target name="build" >
+	<target name="build" depends="buildCmdLineTestTools,buildCmdLineTestUtils">
 		<antcall target="dist" inheritall="true" />
 	</target>
 </project>