8318964: Fix build failures caused by 8315097

Reviewed-by: aboldtch, rcastanedalo
This commit is contained in:
Leo Korinth 2023-10-27 09:51:22 +00:00
parent d52a995f35
commit b9dcd4b741
5 changed files with 5 additions and 5 deletions
test
hotspot/jtreg/runtime
jdk
java/lang/instrument/modules
tools/launcher/modules/classpath

@ -45,7 +45,7 @@ public class CompressedClassPointersEncodingScheme {
private static void test(long forceAddress, long classSpaceSize, long expectedEncodingBase, int expectedEncodingShift) throws IOException {
String forceAddressString = String.format("0x%016X", forceAddress).toLowerCase();
String expectedEncodingBaseString = String.format("0x%016X", expectedEncodingBase).toLowerCase();
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-Xshare:off", // to make CompressedClassSpaceBaseAddress work
"-XX:+UnlockDiagnosticVMOptions",
"-XX:-UseCompressedOops", // keep VM from optimizing heap location

@ -43,7 +43,7 @@ public class TestSymbolsInHsErrFile {
public static void main(String[] args) throws Exception {
// Start a jvm and cause a SIGSEGV / ACCESS_VIOLATION
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
"-XX:+UnlockDiagnosticVMOptions",
"-Xmx100M",
"-XX:-CreateCoredumpOnCrash",

@ -146,7 +146,7 @@ public class TestHugePageDecisionsAtVMStartup {
boolean useTHP = allOptions.contains("-XX:+UseTransparentHugePages");
System.out.println("useLP: " + useLP + " useTHP: " + useTHP);
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(allOptions.toArray(new String[0]));
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(allOptions.toArray(new String[0]));
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.reportDiagnosticSummary();
HugePageConfiguration configuration = HugePageConfiguration.readFromOS();

@ -47,7 +47,7 @@ public class AppendToClassPathModuleTest {
public static void main(String... args) throws Throwable {
String modulepath = System.getProperty("test.module.path");
// can't use ProcessTools.createJavaProcessBuilder as it always adds -cp
// can't use ProcessTools.createLimitedTestJavaProcessBuilder as it always adds -cp
ProcessBuilder pb = new ProcessBuilder(
JDKToolFinder.getTestJDKTool("java"),
"-javaagent:Agent.jar",

@ -200,7 +200,7 @@ public class JavaClassPathTest {
}
private OutputAnalyzer execute(List<String> options) throws Throwable {
// can't use ProcessTools.createJavaProcessBuilder as it always adds -cp
// can't use ProcessTools.createLimitedTestJavaProcessBuilder as it always adds -cp
ProcessBuilder pb = new ProcessBuilder(
Stream.concat(Stream.of(JDKToolFinder.getTestJDKTool("java")),
options.stream()