Skip to content

Commit ae29f9c

Browse files
committed
8268530: resourcehogs/serviceability/jvmti/GetObjectSizeOverflow.java should be run in driver mode
Reviewed-by: sspitsyn
1 parent ea19b04 commit ae29f9c

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

test/hotspot/jtreg/resourcehogs/serviceability/jvmti/GetObjectSizeOverflow.java

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -37,31 +37,28 @@
3737
* @requires os.maxMemory > 6G
3838
* @build GetObjectSizeOverflowAgent
3939
* @run driver jdk.test.lib.helpers.ClassFileInstaller GetObjectSizeOverflowAgent
40-
* @run main GetObjectSizeOverflow
40+
* @run driver GetObjectSizeOverflow
4141
*/
4242

4343
import java.io.PrintWriter;
4444

4545
import jdk.test.lib.JDKToolFinder;
46-
import jdk.test.lib.Platform;
4746
import jdk.test.lib.process.OutputAnalyzer;
4847
import jdk.test.lib.process.ProcessTools;
49-
import jtreg.SkippedException;
5048

5149
public class GetObjectSizeOverflow {
5250
public static void main(String[] args) throws Exception {
5351

54-
PrintWriter pw = new PrintWriter("MANIFEST.MF");
55-
pw.println("Premain-Class: GetObjectSizeOverflowAgent");
56-
pw.close();
52+
try (var pw = new PrintWriter("MANIFEST.MF")) {
53+
pw.println("Premain-Class: GetObjectSizeOverflowAgent");
54+
}
5755

58-
ProcessBuilder pb = new ProcessBuilder();
59-
pb.command(new String[] { JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF", "agent.jar", "GetObjectSizeOverflowAgent.class"});
60-
pb.start().waitFor();
56+
var jar = new ProcessBuilder(JDKToolFinder.getJDKTool("jar"), "cmf", "MANIFEST.MF", "agent.jar", "GetObjectSizeOverflowAgent.class");
57+
new OutputAnalyzer(jar.start()).shouldHaveExitValue(0);
6158

6259
ProcessBuilder pt = ProcessTools.createTestJvm("-Xmx4000m", "-javaagent:agent.jar", "GetObjectSizeOverflowAgent");
6360
OutputAnalyzer output = new OutputAnalyzer(pt.start());
64-
6561
output.stdoutShouldContain("GetObjectSizeOverflow passed");
62+
output.shouldHaveExitValue(0);
6663
}
6764
}

0 commit comments

Comments
 (0)