Merge pull request #13473 from renfeiw/playlist2

llxia · web-flow · commit 1b9a288d02fe · 2021-09-14T10:26:11.000-04:00
Update functional tests dependencies part2
diff --git a/test/functional/JIT_Test/build.xml b/test/functional/JIT_Test/build.xml
@@ -27,7 +27,6 @@
 	<description>
     	JIT_Test
     </description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/JIT_Test" />
diff --git a/test/functional/JLM_Tests/build.xml b/test/functional/JLM_Tests/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build JLM Tests
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- Set global properties for this build. -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/JLM_Tests" />
diff --git a/test/functional/Jsr292/build.xml b/test/functional/Jsr292/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build J9 JSR 292 Tests 
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/Jsr292" />
diff --git a/test/functional/Jsr335/build.xml b/test/functional/Jsr335/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build J9 JSR335 Test
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/Jsr335" />
diff --git a/test/functional/Jsr335_interfaceStaticMethod/build.xml b/test/functional/Jsr335_interfaceStaticMethod/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build JSR335 InterfaceStaticMethod Test
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/Jsr335_interfaceStaticMethod" />
diff --git a/test/functional/NativeTest/build.xml b/test/functional/NativeTest/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build NativeTest
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/NativeTest" />
diff --git a/test/functional/OpenJ9_Jsr_292_API/build.xml b/test/functional/OpenJ9_Jsr_292_API/build.xml
@@ -25,7 +25,6 @@
 	<description>
 		Build OpenJ9 JSR 292 API Tests 
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/OpenJ9_Jsr_292_API" />
diff --git a/test/functional/Panama/build.xml b/test/functional/Panama/build.xml
@@ -26,7 +26,6 @@
 	<description>
 		Paname project
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/Panama" />
diff --git a/test/functional/SharedCPEntryInvokerTests/build.xml b/test/functional/SharedCPEntryInvokerTests/build.xml
@@ -27,7 +27,6 @@
 	<description>
        Build J9 Shared ConstantPoolEntry Invoker Tests
     </description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/SharedCPEntryInvokerTests" />
diff --git a/test/functional/TestExample/build.xml b/test/functional/TestExample/build.xml
@@ -27,7 +27,6 @@
 	<description>
     	Test Example
     </description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/TestExample" />
diff --git a/test/functional/UnsafeTest/build.xml b/test/functional/UnsafeTest/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build OpenJ9 Unsafe Tests
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/UnsafeTest" />
diff --git a/test/functional/VM_Test/build.xml b/test/functional/VM_Test/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build VM_Test
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 	<property name="LIB" value="junit4,asm_all,javassist,testng"/>
 	<import file="${TEST_ROOT}/TKG/scripts/getDependencies.xml"/>
 
diff --git a/test/functional/Valhalla/build.xml b/test/functional/Valhalla/build.xml
@@ -26,7 +26,6 @@
 	<description>
 		Build Valhalla Tests
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 
 	<!-- set global properties for this build -->
 	<property name="DEST" value="${BUILD_ROOT}/functional/Valhalla" />
diff --git a/test/functional/cmdLineTests/build.xml b/test/functional/cmdLineTests/build.xml
@@ -27,7 +27,6 @@
 	<description>
 		Build cmdLineTests
 	</description>
-	<import file="${TEST_ROOT}/functional/build.xml"/>
 	<import file="${TEST_ROOT}/functional/cmdLineTests/buildTools.xml"/>
 
 	<!-- set properties for this build -->
