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: mdoerr
Backport-of: c0dce25

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

@@ -93,7 +93,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

@@ -22,6 +22,7 @@
  */
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import sun.jvm.hotspot.HotSpotAgent;
@@ -154,9 +155,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,