From 61a0d1e5ad2f773d0df2b3ddbdd5364182f53013 Mon Sep 17 00:00:00 2001
From: Sophia Guo <sophia.gwf@gmail.com>
Date: Wed, 21 Aug 2024 16:44:51 -0400
Subject: [PATCH] Do not create files under mounted path

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
---
 test/system/reproducibleCompare/playlist.xml  | 20 -------------------
 .../reproducible/linux_repro_build_compare.sh |  6 ++++--
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/test/system/reproducibleCompare/playlist.xml b/test/system/reproducibleCompare/playlist.xml
index 2cffcd482..ba90cddfb 100644
--- a/test/system/reproducibleCompare/playlist.xml
+++ b/test/system/reproducibleCompare/playlist.xml
@@ -59,24 +59,4 @@
 		</versions>
 		<platformRequirements>os.win</platformRequirements>
 	</test>
-	<test>
-		<testCaseName>Rebuild_Same_JDK_Reproducibility_Test_Mac</testCaseName>
-		<command>ls -l $(TEST_ROOT)$(D)system$(D)reproducibleCompare$(D);\
-		$(TEST_ROOT)$(D)system$(D)reproducibleCompare$(D)macos_repro_build_compare.sh $(SBOM_FILE) $(JDK_FILE) $(REPORTDIR); \
-	$(TEST_STATUS)
-		</command>
-		<levels>
-			<level>dev</level>
-		</levels>
-		<groups>
-			<group>system</group>
-		</groups>
-        <vendors>
-            <vendor>eclipse</vendor>
-        </vendors>
-		<versions>
-			<version>21+</version>
-		</versions>
-		<platformRequirements>os.osx</platformRequirements>
-	</test>
 </playlist>
\ No newline at end of file
diff --git a/tooling/reproducible/linux_repro_build_compare.sh b/tooling/reproducible/linux_repro_build_compare.sh
index f2210ca68..0442ba865 100755
--- a/tooling/reproducible/linux_repro_build_compare.sh
+++ b/tooling/reproducible/linux_repro_build_compare.sh
@@ -204,11 +204,13 @@ tar xpfz temurin-build/workspace/target/OpenJDK*-jdk_*tar.gz -C compare
 cp temurin-build/workspace/target/OpenJDK*-jdk_*tar.gz reproJDK.tar.gz
 cp "$SBOM" SBOM.json
 
+cp "${ScriptPath}/repro_*.sh" $PWD
 rc=0
-
-echo "./repro_compare.sh temurin ${comparedDir}/ temurin compare/ Linux 2>&1" | sh &
+set +e
+echo "./repro_compare.sh temurin $comparedDir/ temurin compare/ Linux 2>&1" | sh &
 wait
 rc=$?
+set -e
 
 if [ $rc -eq 0 ]; then
   echo "Compare identical !"