OpenJDK / jdk / jdk
changeset 57654:b218684fc61b
8236917: TestInstanceKlassSize.java fails with "The size computed by SA for java.lang.Object does not match"
Summary: Use getTestJavaOpts() instead of getVmOptions() because of mach5 configuration settings.
Reviewed-by: lmesnik, cjplummer, dholmes
| author | coleenp |
|---|---|
| date | Wed, 15 Jan 2020 08:11:03 -0500 |
| parents | 89db52d75aee |
| children | 6d8a39322e51 |
| files | test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java |
| diffstat | 2 files changed, 3 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java Wed Jan 15 08:08:54 2020 -0500 +++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java Wed Jan 15 08:11:03 2020 -0500 @@ -75,7 +75,7 @@ try { List<String> vmArgs = new ArrayList<String>(); vmArgs.add("-XX:+UsePerfData"); - vmArgs.addAll(Utils.getVmOptions()); + vmArgs.addAll(Arrays.asList(Utils.getTestJavaOpts())); app = LingeredApp.startApp(vmArgs); System.out.println ("Started LingeredApp with pid " + app.getPid()); } catch (Exception ex) {
--- a/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java Wed Jan 15 08:08:54 2020 -0500 +++ b/test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java Wed Jan 15 08:11:03 2020 -0500 @@ -116,7 +116,7 @@ Integer.toString(lingeredAppPid) }; - // Start a new process to attach to the LingeredApp process + // Start a new process to attach to the LingeredApp process to get SA info ProcessBuilder processBuilder = ProcessTools .createJavaProcessBuilder(toolArgs); OutputAnalyzer SAOutput = ProcessTools.executeProcess(processBuilder); @@ -150,9 +150,7 @@ if (args == null || args.length == 0) { try { - List<String> vmArgs = new ArrayList<String>(); - vmArgs.addAll(Utils.getVmOptions()); - + List<String> vmArgs = Arrays.asList(Utils.getTestJavaOpts()); theApp = new LingeredAppWithInterface(); LingeredApp.startApp(vmArgs, theApp); createAnotherToAttach(instanceKlassNames,