From c07073574793842e6c9d8af818febfd67b241c7c Mon Sep 17 00:00:00 2001
From: Andrew Leonard <31470007+andrew-m-leonard@users.noreply.github.com>
Date: Tue, 3 Jan 2023 18:26:11 +0000
Subject: [PATCH] Correct jck stage material checkout when target jck root not
 the same as the repo folder (#4224)

* Correct jck stage material checkout when target jck root not the same as the repo folder

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

* Correct jck stage material checkout when target jck root not the same as the repo folder

Signed-off-by: Andrew Leonard <anleonar@redhat.com>

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
---
 jck/build.xml                    | 1 +
 jck/jtrunner/JavaTestRunner.java | 1 +
 2 files changed, 2 insertions(+)

diff --git a/jck/build.xml b/jck/build.xml
index 332474c7d0..d93a73b608 100644
--- a/jck/build.xml
+++ b/jck/build.xml
@@ -134,6 +134,7 @@
 					<arg value="-b"/>
 					<arg value="${jck_branch}"/>
 					<arg value="${JCK_GIT_REPO_USED}" />
+					<arg value="${JCK_ROOT_USED}" />
 				</exec>
 			</then>
 			<!-- jck materials exist, update jck materials if needed-->
diff --git a/jck/jtrunner/JavaTestRunner.java b/jck/jtrunner/JavaTestRunner.java
index 7c670489d0..7b4308df50 100644
--- a/jck/jtrunner/JavaTestRunner.java
+++ b/jck/jtrunner/JavaTestRunner.java
@@ -223,6 +223,7 @@ public static boolean generateJTB() throws Exception {
 					if (!jckVersion.equals(actualJckVersion)) {
 						System.out.println("test-args jckversion " + jckVersion + " does not match actual jckversion " + actualJckVersion + ". Using actual jckversion " + actualJckVersion);
 						jckVersion = actualJckVersion;
+						jckVersionNo = jckVersion.replace("jck", "");
 					}
 				}
 			}