Skip to content

add cvm kind of vm in jvm.cfg #97

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luchsh merged 1 commit into from
Nov 10, 2025
Merged

add cvm kind of vm in jvm.cfg #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions cvm.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,20 +153,21 @@ cvm8: jdk8vm17

cvm8default17: jdk8vm17
echo "-server17 KNOWN" > $(CVM8_LIBDIR)/jvm.cfg
echo "-cvm KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-server KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-client IGNORE" >> $(CVM8_LIBDIR)/jvm.cfg
echo "-server17 KNOWN" > $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/$(ARCH_DIR)/jvm.cfg
echo "-server KNOWN" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/$(ARCH_DIR)/jvm.cfg
echo "-client IGNORE" >> $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/$(ARCH_DIR)/jvm.cfg
cp -f $(CVM8_LIBDIR)/jvm.cfg $(OUTPUTDIR)/$(DISTRO_NAME)/jre/lib/$(ARCH_DIR)/jvm.cfg

JVM_PATCH_ARTIFACTS := jre/lib/rt17.jar jre/lib/rt8.jar jre/lib/$(ARCH_DIR)/libjava17.so jre/lib/$(ARCH_DIR)/libjimage17.so jre/lib/$(ARCH_DIR)/libjdwp17.so jre/lib/$(ARCH_DIR)/server17 jre/lib/$(ARCH_DIR)/jvm.cfg
JVM_PATCH_ARTIFACTS_SOFTLINK := jre/lib/$(ARCH_DIR)/cvm

jvm-patch: cvm8default17
@echo "###### Composing CVM8 jvm patch ######"
mkdir -p $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)
for file in $(JVM_PATCH_ARTIFACTS); do \
cd $(OUTPUTDIR)/$(DISTRO_NAME) && cp -rf --parents $$file $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)/; \
done
cd $(OUTPUTDIR)/$(DISTRO_NAME) && cp -a --parents $(JVM_PATCH_ARTIFACTS_SOFTLINK) $(OUTPUTDIR)/$(DISTRO_JVM_PATCH_NAME)/;

-clean-jdk8vm17:
rm -fr $(BUILDDIR)/alt_kernel
Expand Down Expand Up @@ -202,6 +203,8 @@ jdk8vm17: -clean-jdk8vm17 -bootstrap build_jdk8u build_jdk17u altkernel
cp -f $(SRC_BUILDDIR_17)/jdk/lib/libjdwp.debuginfo $(CVM8_LIBDIR)/libjdwp17.debuginfo && \
cp -f $(SRC_BUILDDIR_17)/jdk/lib/server/libjvm.debuginfo $(CVM8_LIBDIR)/server17/libjvm.debuginfo && \
[[ "x$$(grep server17 $(CVM8_LIBDIR)/jvm.cfg)" = "x" ]] && echo "-server17 KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg && \
[[ "x$$(grep cvm $(CVM8_LIBDIR)/jvm.cfg)" = "x" ]] && echo "-cvm KNOWN" >> $(CVM8_LIBDIR)/jvm.cfg; \
pushd $(CVM8_LIBDIR) && ln -sf server17 cvm && popd; \
cp -rf $(CVM8DIR)/* $(OUTPUTDIR)/$(DISTRO_NAME)/; \
}
ifeq ($(MODE), release)
Expand Down Expand Up @@ -299,7 +302,7 @@ ifeq ($(SKIP_BUILD), true)
else
-setup_jtreg8: $(JTREG) jdk8vm17
endif
$(eval JT8_OPTS=-jdk:${CVM8DIR} -w:${JT8_WORKDIR} -r:${JT8_REPORTDIR} -a -ea -esa -ignore:quiet -ovm -v:fail,error,time -javaoption:-server17 ${JT8_OPTS})
$(eval JT8_OPTS=-jdk:${CVM8DIR} -w:${JT8_WORKDIR} -r:${JT8_REPORTDIR} -a -ea -esa -ignore:quiet -ovm -v:fail,error,time -javaoption:-cvm ${JT8_OPTS})

# Setup bootstrap JDK from a given URL
# $1 root directory of jtreg
Expand Down
4 changes: 2 additions & 2 deletions cvm/test/java/lang/Class/BootClassPathTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @bug 1234567
* @summary check -Xbootclasspath and -Xbootclasspath/p option works for java17
* @compile BootClassPathTest.java BootClassPathTestRunner.java
* @run main/othervm -server17 BootClassPathTestRunner
* @run main/othervm -cvm BootClassPathTestRunner
*/

import java.io.BufferedReader;
Expand Down Expand Up @@ -53,7 +53,7 @@ public static void main(String[] argv) throws Exception {
static void test(String bootclasspath, String expect) throws Exception {
List<String> cmd = new ArrayList<String>();
cmd.add(new File(new File(JAVAHOME, "bin"), "java").getPath());
cmd.add("-server17");
cmd.add("-cvm");
cmd.add(bootclasspath);
cmd.add("BootClassPathTest");
ProcessBuilder pb = new ProcessBuilder(cmd);
Expand Down
2 changes: 1 addition & 1 deletion cvm/test/java/lang/Class/ForNameHidden.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @test
* @bug 1234567
* @summary use Class.forName to detect anonymous classes
* @run main/othervm -server17 -Xlog:class+init=info,class+load=info ForNameHidden
* @run main/othervm -cvm -Xlog:class+init=info,class+load=info ForNameHidden
* @run main/othervm -server -verbose:class ForNameHidden
*/

Expand Down
2 changes: 1 addition & 1 deletion cvm/test/java/lang/String/StringContains.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
* @bug 1234567
* @summary check String.contains c2 bug is fixed
* @compile StringContains.java
* @run main/othervm -server17 StringContains
* @run main/othervm -cvm StringContains
*/

public class StringContains {
Expand Down
2 changes: 1 addition & 1 deletion cvm/test/sun/tools/common/ApplicationSetup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ if [ -z "${TESTCLASSES}" ]; then
exit 1
fi

JAVA="${TESTJAVA}/bin/java -server17"
JAVA="${TESTJAVA}/bin/java -cvm"

# Support functions to start and stop a given application

Expand Down
Loading