8236917: TestInstanceKlassSize.java fails with "The size computed by SA for java.lang.Object does not match"

Use getTestJavaOpts() instead of getVmOptions() because of mach5 configuration settings.

Reviewed-by: lmesnik, cjplummer, dholmes

Author: coleenp

test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSize.java

@@ -75,7 +75,7 @@ private static void startMeWithArgs() throws Exception {
         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) {

test/hotspot/jtreg/serviceability/sa/TestInstanceKlassSizeForInterface.java

@@ -116,7 +116,7 @@ private static void createAnotherToAttach(
             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 @@ public static void main (String... args) throws Exception {
 
         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,