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 <[email protected]>

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

Signed-off-by: Andrew Leonard <[email protected]>

Signed-off-by: Andrew Leonard <[email protected]>

Author: andrew-m-leonard

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-->

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", "");
 					}
 				}
 			}