From c359b07e0588621a953b471c2a157eb34da0a450 Mon Sep 17 00:00:00 2001
From: sophiaxu0424 <xuminghong0424@gmail.com>
Date: Thu, 13 Jun 2024 12:32:53 -0400
Subject: [PATCH] Change generated core files des to reportdir

This is to change the directory of core files to the correct one

Related to issue: https://github.com/adoptium/aqa-tests/issues/5373

Signed-off-by: sophiaxu0424 <xuminghong0424@gmail.com>
---
 functional/OpenJcePlusTests/playlist.xml | 5 ++++-
 functional/OpenJcePlusTests/test.xml     | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index 8c651bfe80..2885ad3ae5 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -25,7 +25,10 @@
 				<platform>^((?!(ppc64_aix|ppc64le_linux|x86-64_linux|x86-64_windows|s390x_linux)).)*$</platform>
 			</disable>
 		</disables>
-		<command>ant -f ${BUILD_ROOT}/functional/OpenJcePlusTests/test.xml -DTEST_JAVA=$(Q)$(JAVA_COMMAND)$(Q) launch_test; \
+		<command> mkdir -p ${REPORTDIR} \
+		cd ${REPORTDIR} \
+		cp -r ${TEST_RESROOT}/../../functional/OpenJcePlusTests/test.xml ${REPORTDIR} \
+		ant -f test.xml -DTEST_JAVA=$(Q)$(JAVA_COMMAND)$(Q) launch_test; \
 	$(TEST_STATUS)</command>
 		<levels>
 			<level>extended</level>
diff --git a/functional/OpenJcePlusTests/test.xml b/functional/OpenJcePlusTests/test.xml
index 4914328da3..aff722a062 100644
--- a/functional/OpenJcePlusTests/test.xml
+++ b/functional/OpenJcePlusTests/test.xml
@@ -15,6 +15,9 @@
 -->
 
 <project name="Launcher script for OpenJcePlusTests" default="help" basedir=".">
+	<property name="REPORTDIR" value="${REPORTDIR}" />
+	<property name="dump.name" value="JCE.J9CORE.DMP" />
+	<property name="system.dump" value="${REPORTDIR}/${dump.name}" />
 	<target name="help">
 		<echo>Ant script to run the tests for ibm.jceplus.junit.TestMemStressAll,
 		ibm.jceplus.junit.TestMultiThread,
@@ -26,6 +29,7 @@
 	<target name="launch_test">
 		<echo message="Running ibm.jceplus.junit.TestMemStressAll, ibm.jceplus.junit.TestMultiThread, ibm.jceplus.junit.TestMultithreadFIP and ibm.jceplus.junit.TestAll in ${user.dir}" />
 		<mkdir dir="junitreports" />
+		<mkdir dir=${REPORTDIR} />
 		<java jvm="${TEST_JAVA}"
 				classname="org.apache.tools.ant.launch.Launcher"
 				fork="true"