[crac] RFR: Merge jdk-23+37

[Anton Kozlov]

On 8/30/24 2:26 PM, Radim Vansa wrote:
> This merges the release candidate tag 23+37 into CRaC, expecting that we will baseline on 23 soon.
> 
> Changes: https://git.openjdk.org/crac/pull/156/files
>    Stats: 1800280 lines in 17153 files changed: 522366 ins; 776857 del; 501057 mod
>    Patch: https://git.openjdk.org/crac/pull/156.diff
>    Fetch: git fetch https://git.openjdk.org/crac.git pull/156/head:pull/156
> 
> PR: https://git.openjdk.org/crac/pull/156

The PR is too big for github to visualize it. I'm reviewing the difference with jdk-23+37:

diff --git a/make/autoconf/Makefile.template b/make/autoconf/Makefile.template
index 4cb5057c05c..a1baff3395c 100644
--- a/make/autoconf/Makefile.template
+++ b/make/autoconf/Makefile.template
@@ -21,7 +21,16 @@
  # questions.
  #

-# This Makefile was generated by configure @DATE_WHEN_CONFIGURED@
-# GENERATED FILE, DO NOT EDIT
-SPEC:=@OUTPUTDIR@/spec.gmk
-include @WORKSPACE_ROOT@/Makefile
+AsyncGetCallTrace
+jio_fprintf
+jio_printf
+jio_snprintf
+jio_vfprintf
+jio_vsnprintf
+JNI_CreateJavaVM
+JNI_GetCreatedJavaVMs
+JNI_GetDefaultJavaVMInitArgs
+JVM_IsForeignLinkerSupported
+JVM_FindClassFromBootLoader
+JVM_InitAgentProperties
+JVM_Checkpoint

This seems to be mis-merge.

---

commit 20975f6d3ddc8d5475476c0909ee3e20c05c60ef
Author: Radim Vansa <rvansa at azul.com>
Date:   Thu Aug 29 17:36:57 2024 +0200

     Build jdk/test/lib/containers/docker for tests

diff --git a/make/test/BuildTestLib.gmk b/make/test/BuildTestLib.gmk
index d48f263f6f9..2298fc734c5 100644
--- a/make/test/BuildTestLib.gmk
+++ b/make/test/BuildTestLib.gmk
@@ -60,7 +60,7 @@ TARGETS += $(BUILD_WB_JAR)
  $(eval $(call SetupJavaCompilation, BUILD_TEST_LIB_JAR, \
      TARGET_RELEASE := $(TARGET_RELEASE_NEWJDK_UPGRADED), \
      SRC := $(TEST_LIB_SOURCE_DIR), \
-    EXCLUDES := jdk/test/lib/containers jdk/test/lib/security, \
+    EXCLUDES := jdk/test/lib/containers/cgroup jdk/test/lib/security, \
      BIN := $(TEST_LIB_SUPPORT)/test-lib_classes, \
      HEADERS := $(TEST_LIB_SUPPORT)/test-lib_headers, \
      JAR := $(TEST_LIB_SUPPORT)/test-lib.jar, \
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
index fc3b793c47a..3f1e4c3b69b 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerRunOptions.java
@@ -59,10 +59,10 @@ public DockerRunOptions(String imageNameAndTag, String javaCmd,
          this.imageNameAndTag = imageNameAndTag;
          this.command = javaCmd;
          this.classToRun = classToRun;
-        this.addJavaOpts(javaOpts);
+        Collections.addAll(this.javaOpts, javaOpts);
          // always print hserr to stderr in the docker tests to avoid
          // trouble accessing it after a crash in the container
-        this.addJavaOpts("-XX:+ErrorFileToStderr");
+        Collections.addAll(this.javaOpts, "-XX:+ErrorFileToStderr");
      }

      public DockerRunOptions addDockerOpts(String... opts) {


The reason for this change is not clear, it seems to be this PR specific, but it is not CRaC-specific. Better to be done as a follow-up change.

In the rest, LGTM. Thank you!

-- Anton