stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8316451: 6 java/lang/instrument/PremainClass tests ignore VM flags

Browse Source 
Reviewed-by: cjplummer, sspitsyn
This commit is contained in:
Leonid Mesnik 2024-02-15 22:50:14 +00:00
parent 99c9ae127c
commit 9029bf644e
2 changed files with 6 additions and 10 deletions
test/jdk/java/lang/instrument
NegativeAgentRunner.java
PremainClass
PremainClassTest.java

4
test/jdk/java/lang/instrument/NegativeAgentRunner.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -35,7 +35,7 @@ public class NegativeAgentRunner {
}
String agentClassName = argv[0];
String excepClassName = argv[1];
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
"-javaagent:" + agentClassName + ".jar", "-Xmx128m", "-XX:-CreateCoredumpOnCrash",
agentClassName);
OutputAnalyzer output = new OutputAnalyzer(pb.start());

12
test/jdk/java/lang/instrument/PremainClass/PremainClassTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,14 +39,10 @@ public class PremainClassTest {
// a non ascii character.
// Verify that the premain() function is executed correctly.
public static void main(String[] a) throws Exception {
String testArgs = String.format(
"-javaagent:%s/Agent.jar -classpath %s DummyMain",
System.getProperty("test.src"),
System.getProperty("test.classes", "."));
String testArgs = String.format("-javaagent:%s/Agent.jar",
System.getProperty("test.src"));
ProcessBuilder pb = ProcessTools.createLimitedTestJavaProcessBuilder(
Utils.addTestJavaOpts(testArgs.split("\\s+")));
System.out.println("testjvm.cmd:" + Utils.getCommandLine(pb));
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(testArgs, "DummyMain");
OutputAnalyzer output = ProcessTools.executeProcess(pb);
System.out.println("testjvm.stdout:" + output.getStdout());