support hotspot gtest

Author: K0u1e

cvm.mk

@@ -53,6 +53,22 @@ SRC_BUILDDIR_8 :=
 SRC_BUILDDIR_17 :=
 SCRIPTS_DIR ?= $(WORKSPACE)/scripts
 SKIP_BUILD ?= false
+GTEST_VERSION ?= $(shell sed -n 's/^GTEST_VERSION=//p' $(WORKSPACE)/make/conf/github-actions.conf | head -n 1)
+GTEST_ROOT := $(WORKSPACE)/.gtest
+GTEST_ARCHIVE := $(GTEST_ROOT)/release-$(GTEST_VERSION).tar.gz
+GTEST_URL := https://github.com/google/googletest/archive/refs/tags/v$(GTEST_VERSION).tar.gz
+GTEST_DIR := $(GTEST_ROOT)/googletest-$(GTEST_VERSION)
+GTEST_HEADER := $(GTEST_DIR)/googletest/include/gtest/gtest.h
+HOTSPOT_GTEST_CONF := linux-$(CVM_ARCH)-server-$(MODE)
+HOTSPOT_GTEST_BUILD_DIR := $(JDK17_SRCROOT)/build/$(HOTSPOT_GTEST_CONF)
+HOTSPOT_GTEST_LAUNCHER := $(HOTSPOT_GTEST_BUILD_DIR)/images/test/hotspot/gtest/server/gtestLauncher
+HOTSPOT_GTEST_TEST ?= gtest:all
+HOTSPOT_GTEST_SELECTOR := $(patsubst %/server,%,$(patsubst gtest:%,%,$(HOTSPOT_GTEST_TEST)))
+HOTSPOT_GTEST_FILTER := $(if $(filter all,$(HOTSPOT_GTEST_SELECTOR)),,--gtest_filter=$(HOTSPOT_GTEST_SELECTOR)*)
+HOTSPOT_GTEST_JDKDIR := $(OUTPUTDIR)/$(DISTRO_NAME)
+HOTSPOT_GTEST_WORKDIR := $(BUILDDIR)/gtest-manual
+HOTSPOT_GTEST_RESULT_DIR := $(BUILDDIR)/gtest-results
+HOTSPOT_GTEST_EXITCODE := $(HOTSPOT_GTEST_RESULT_DIR)/exitcode.txt
 
 # compile set of alternative kernel/application classes
 # $1 source directory
@@ -154,6 +170,18 @@ $(JDK8_JDK_SRC):
 	wget -nc -O $(JDK8_SRC_TAR) $(JDK8_SRC_TAR_URL)
 	[[ -d $(JDK8_SRCROOT) ]] || (mkdir -p $(JDK8_SRCROOT) && tar -xzf $(JDK8_SRC_TAR) -C $(JDK8_SRCROOT) --strip-components=1)
 
+$(GTEST_HEADER):
+	@echo "Installing googletest $(GTEST_VERSION) to $(GTEST_DIR)"
+	{ \
+		set -e; \
+		[[ -d $(GTEST_ROOT) ]] || mkdir -p $(GTEST_ROOT); \
+		rm -f $(GTEST_ARCHIVE); \
+		wget -q $(GTEST_URL) -O $(GTEST_ARCHIVE); \
+		rm -fr $(GTEST_DIR); \
+		tar xf $(GTEST_ARCHIVE) -C $(GTEST_ROOT); \
+		rm -f $(GTEST_ARCHIVE); \
+	}
+
 cvm8: jdk8vm17
 
 cvm8default17: jdk8vm17
@@ -258,6 +286,52 @@ build_jdk17u: -bootstrap
 	}
 	make $(JDK_MAKE_OPTS) CONF=linux-$(CVM_ARCH)-server-$(MODE) hotspot jdk.jdwp.agent
 
+-configure_jdk17u_gtest: $(GTEST_HEADER) cvm8default17
+	{ \
+		if [[ ! -f $(HOTSPOT_GTEST_BUILD_DIR)/spec.gmk ]] || \
+				! grep -Fqx 'GTEST_FRAMEWORK_SRC := $(GTEST_DIR)' $(HOTSPOT_GTEST_BUILD_DIR)/spec.gmk 2>/dev/null; then \
+			bash configure --with-debug-level=$(MODE) \
+										--with-boot-jdk=$(BOOTJDK17) \
+										--with-hotspot-target-classlib=8 \
+										--with-vendor-name="ByteDance" \
+										--with-vendor-url="https://github.com/bytedance/CompoundVM" \
+										--with-vendor-bug-url="https://github.com/bytedance/CompoundVM/issues" \
+										--with-vendor-vm-bug-url="https://github.com/bytedance/CompoundVM/issues" \
+										--without-version-pre \
+										--without-version-opt \
+										--with-cvm-version-string=$(VERSION) \
+										--with-vendor-name="CompoundVM" \
+										--with-gtest=$(GTEST_DIR) \
+										; \
+		fi; \
+	}
+
+build_hotspot_gtest: -configure_jdk17u_gtest
+	$(MAKE) $(JDK_MAKE_OPTS) CONF=$(HOTSPOT_GTEST_CONF) test-image-hotspot-gtest
+
+test_hotspot_gtest: build_hotspot_gtest
+	@echo
+	@echo "Running hotspot gtest \"$(HOTSPOT_GTEST_TEST)\""
+	@echo "  Launcher: $(HOTSPOT_GTEST_LAUNCHER)"
+	@echo "  JDK under test: $(HOTSPOT_GTEST_JDKDIR)"
+	@echo "  Test report: $(HOTSPOT_GTEST_RESULT_DIR)"
+	@echo
+	@{ \
+		mkdir -p $(HOTSPOT_GTEST_WORKDIR) $(HOTSPOT_GTEST_RESULT_DIR) && \
+		cd $(HOTSPOT_GTEST_WORKDIR) && \
+		set +e; \
+		LD_LIBRARY_PATH=$(HOTSPOT_GTEST_JDKDIR)/jre/lib:$(HOTSPOT_GTEST_JDKDIR)/jre/lib/$(ARCH_DIR):$(HOTSPOT_GTEST_JDKDIR)/jre/lib/$(ARCH_DIR)/server17 \
+		$(HOTSPOT_GTEST_LAUNCHER) \
+			-jdk $(HOTSPOT_GTEST_JDKDIR) \
+			$(HOTSPOT_GTEST_FILTER) \
+			--gtest_output=xml:$(HOTSPOT_GTEST_RESULT_DIR)/gtest.xml \
+			--gtest_catch_exceptions=0 \
+			> >(tee $(HOTSPOT_GTEST_RESULT_DIR)/gtest.txt); \
+		exit_code=$$?; \
+		echo $$exit_code > $(HOTSPOT_GTEST_EXITCODE); \
+		exit $$exit_code; \
+	}
+
 ################ alternative kernel classes ########
 # here we copy the JDK17 kernel classes to separate diretory,
 # and tweak the code to fit into JDK8's boots.
@@ -400,3 +474,8 @@ help:
 	@echo "                     Run CVM8 jtreg8 tests in directory $(CVM8_SRCROOT)/hotspot/test"
 	@echo "  make test_cvm8 JT_TEST=<test selection>"
 	@echo "                     Run additional jtreg8 tests for CVM8 in directory test"
+	@echo "  make build_hotspot_gtest MODE=slowdebug"
+	@echo "                     Download googletest if needed and build hotspot gtest artifacts"
+	@echo "  make test_hotspot_gtest MODE=slowdebug HOTSPOT_GTEST_TEST='gtest:all'"
+	@echo "                     Run hotspot gtests directly against the CVM output image"
+	@echo "                     e.g. HOTSPOT_GTEST_TEST='gtest:Log/server'"

src/hotspot/os/linux/os_linux.cpp

@@ -2707,10 +2707,18 @@ void os::jvm_path(char *buf, jint buflen) {
         len = strlen(buf);
         assert(len < buflen, "Ran out of buffer room");
         jrelib_p = buf + len;
+
+#if HOTSPOT_TARGET_CLASSLIB == 8
+        snprintf(jrelib_p, buflen-len, "/jre/lib/%s", HOTSPOT_LIB_ARCH);
+        if (0 != access(buf, F_OK)) {
+          snprintf(jrelib_p, buflen-len, "/lib/%s", HOTSPOT_LIB_ARCH);
+        }
+#else
         snprintf(jrelib_p, buflen-len, "/jre/lib");
         if (0 != access(buf, F_OK)) {
           snprintf(jrelib_p, buflen-len, "/lib");
         }
+#endif
 
         if (0 == access(buf, F_OK)) {
           // Use current module name "libjvm.so"