Merge pull request #19086 from JasonFengJ9/criutest-v0.44

(v0.44.0-release) CRIU time compensation tests reset TestResult.lockStatus

Author: pshipton

test/functional/cmdLineTests/criu/src/org/openj9/criu/CRIUTestUtils.java

@@ -113,9 +113,9 @@ public static void checkPointJVMNoSetup(CRIUSupport criu, Path path, boolean del
 	}
 
 	public static void showThreadCurrentTime(String logStr) {
-		System.out.println(logStr + ", current thread name: " + Thread.currentThread().getName() + ", " + new Date()
-				+ ", System.currentTimeMillis(): " + System.currentTimeMillis() + ", System.nanoTime(): "
-				+ System.nanoTime());
+		System.out.println(Thread.currentThread().getName() + ": " + new Date() + ", " + logStr
+				+ ", System.currentTimeMillis(): " + System.currentTimeMillis()
+				+ ", System.nanoTime(): " + System.nanoTime());
 	}
 
 

test/functional/cmdLineTests/criu/src/org/openj9/criu/JDK11UpTimeoutAdjustmentTest.java

@@ -21,6 +21,7 @@
  *******************************************************************************/
 package org.openj9.criu;
 
+import java.util.Date;
 import jdk.internal.misc.Unsafe;
 import openj9.internal.criu.InternalCRIUSupport;
 import org.eclipse.openj9.criu.CRIUSupport;
@@ -57,21 +58,25 @@ private void test(String testName) throws InterruptedException {
 		switch (testName) {
 		case "testThreadPark":
 			testThreadParkHelper("testThreadPark NO C/R");
+			testResult.lockStatus.set(0);
 			testThread = testThreadPark();
 			break;
 		case "testThreadSleep":
 			testThreadSleepHelper("testThreadSleep NO C/R");
+			testResult.lockStatus.set(0);
 			testThread = testThreadSleep();
 			break;
 		case "testObjectWaitNotify":
 			testThread = testObjectWaitNotify();
 			break;
 		case "testObjectWaitTimedNoNanoSecond":
 			testObjectWaitTimedHelper("testObjectWaitTimedNoNanoSecond NO C/R", msTime2s, 0);
+			testResult.lockStatus.set(0);
 			testThread = testObjectWaitTimedNoNanoSecond();
 			break;
 		case "testObjectWaitTimedWithNanoSecond":
 			testObjectWaitTimedHelper("testObjectWaitTimedWithNanoSecond NO C/R", msTime2s, nsTime500kns);
+			testResult.lockStatus.set(0);
 			testThread = testObjectWaitTimedWithNanoSecond();
 			break;
 		default:
@@ -129,7 +134,8 @@ private void test(String testName) throws InterruptedException {
 	public static void showMessages(String logStr, long expectedTime, boolean isMillis, long elapsedTime,
 			long startNanoTime, long endNanoTime) {
 		long crDeltaNs = InternalCRIUSupport.getCheckpointRestoreNanoTimeDelta();
-		System.out.println(logStr + expectedTime + " " + (isMillis ? "ms" : "ns")
+		System.out.println(Thread.currentThread().getName() + ": " + new Date() + ", "
+				+ logStr + expectedTime + " " + (isMillis ? "ms" : "ns")
 				+ ", but the actual elapsed time was: " + elapsedTime + "ns (~" + (elapsedTime / NANOS_PER_MILLI)
 				+ "ms) with startNanoTime = " + startNanoTime + "ns, and endNanoTime = " + endNanoTime
 				+ "ns, CheckpointRestoreNanoTimeDelta: " + crDeltaNs + "ns (~" + (crDeltaNs / NANOS_PER_MILLI) + "ms)");