1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8307408: Some jdk/sun/tools/jhsdb tests don't pass test JVM args to the debuggee JVM

Browse Source 
Reviewed-by: sspitsyn, lmesnik
This commit is contained in:
Chris Plummer 2023-08-07 18:51:29 +00:00
parent 83edffa608
commit 87b08b6e01
4 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/jdk/ProblemList-zgc.txt
View File

@ -28,3 +28,6 @@
############################################################################# #############################################################################
java/util/concurrent/locks/Lock/OOMEInAQS.java 8309218 generic-all java/util/concurrent/locks/Lock/OOMEInAQS.java 8309218 generic-all
sun/tools/jhsdb/JShellHeapDumpTest.java 8276539 generic-all
sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8276539 generic-all

1
test/jdk/ProblemList.txt
View File

@ -734,6 +734,7 @@ sun/tools/jstat/jstatLineCounts3.sh 8268211 linux-aa
sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64 sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64
sun/tools/jhsdb/JStackStressTest.java 8276210 linux-aarch64 sun/tools/jhsdb/JStackStressTest.java 8276210 linux-aarch64
sun/tools/jhsdb/HeapDumpTestWithActiveProcess.java 8313798 generic-aarch64
############################################################################ ############################################################################

11
test/jdk/sun/tools/jhsdb/JShellHeapDumpTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2019, 2022, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -150,7 +150,14 @@ public class JShellHeapDumpTest {
System.out.println("Starting Jshell"); System.out.println("Starting Jshell");
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
try { try {
ProcessBuilder pb = new ProcessBuilder(JDKToolFinder.getTestJDKTool("jshell")); JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jshell");
if (doSleep) {
launcher.addVMArgs(Utils.getTestJavaOpts());
} else {
// Don't allow use of SerialGC. See JDK-8313655.
launcher.addVMArgs(Utils.getFilteredTestJavaOpts("-XX:\\+UseSerialGC"));
}
ProcessBuilder pb = new ProcessBuilder(launcher.getCommand());
jShellProcess = ProcessTools.startProcess("JShell", pb, jShellProcess = ProcessTools.startProcess("JShell", pb,
s -> { // warm-up predicate s -> { // warm-up predicate
return s.contains("Welcome to JShell"); return s.contains("Welcome to JShell");

6
test/jdk/sun/tools/jhsdb/JStackStressTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2021, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -93,7 +93,9 @@ public class JStackStressTest {
System.out.println("Starting Jshell"); System.out.println("Starting Jshell");
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
try { try {
ProcessBuilder pb = new ProcessBuilder(JDKToolFinder.getTestJDKTool("jshell")); JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jshell");
launcher.addVMArgs(Utils.getTestJavaOpts());
ProcessBuilder pb = new ProcessBuilder(launcher.getCommand());
jShellProcess = ProcessTools.startProcess("JShell", pb); jShellProcess = ProcessTools.startProcess("JShell", pb);
} catch (Exception ex) { } catch (Exception ex) {
throw new RuntimeException("Test ERROR " + ex, ex); throw new RuntimeException("Test ERROR " + ex, ex);