Adapt additional calls

Author: GoeLin

test/hotspot/jtreg/compiler/c2/Test8062950.java

@@ -36,10 +36,10 @@
 public class Test8062950 {
     private static final String CLASSNAME = "DoesNotExist";
     public static void main(String[] args) throws Exception {
-        ProcessTools.executeTestJvm("-Xcomp",
-                                    "-XX:-TieredCompilation",
-                                    "-XX:-UseOptoBiasInlining",
-                                    CLASSNAME)
+        ProcessTools.executeTestJava("-Xcomp",
+                                     "-XX:-TieredCompilation",
+                                     "-XX:-UseOptoBiasInlining",
+                                     CLASSNAME)
                     .shouldHaveExitValue(1)
                     .shouldContain("Error: Could not find or load main class " + CLASSNAME)
                     .shouldNotContain("A fatal error has been detected")

test/hotspot/jtreg/runtime/jni/checked/TestCheckedEnsureLocalCapacity.java

@@ -65,11 +65,11 @@ public static void main(String[] args) throws Throwable {
         }
 
         // No warning
-        ProcessTools.executeTestJvm("-Xcheck:jni",
-                                    "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
-                                    "TestCheckedEnsureLocalCapacity",
-                                    Integer.toString(testArgs[0][0]),
-                                    Integer.toString(testArgs[0][1])).
+        ProcessTools.executeTestJava("-Xcheck:jni",
+                                     "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
+                                     "TestCheckedEnsureLocalCapacity",
+                                     Integer.toString(testArgs[0][0]),
+                                     Integer.toString(testArgs[0][1])).
             shouldHaveExitValue(0).
             // check no capacity warning
             stdoutShouldNotMatch(EXCEED_WARNING).
@@ -78,11 +78,11 @@ public static void main(String[] args) throws Throwable {
             reportDiagnosticSummary();
 
         // Warning
-        ProcessTools.executeTestJvm("-Xcheck:jni",
-                                    "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
-                                    "TestCheckedEnsureLocalCapacity",
-                                    Integer.toString(testArgs[1][0]),
-                                    Integer.toString(testArgs[1][1])).
+        ProcessTools.executeTestJava("-Xcheck:jni",
+                                     "-Djava.library.path=" + Utils.TEST_NATIVE_PATH,
+                                     "TestCheckedEnsureLocalCapacity",
+                                     Integer.toString(testArgs[1][0]),
+                                     Integer.toString(testArgs[1][1])).
             shouldHaveExitValue(0).
             // check for capacity warning
             stdoutShouldMatch(EXCEED_WARNING).

test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/extcallback/Test.java

@@ -41,7 +41,7 @@
 public class Test {
 
     public static void main(String[] args) throws Exception {
-        ProcessTools.executeTestJvm("-agentlib:extcallback", Test1.class.getName())
+        ProcessTools.executeTestJava("-agentlib:extcallback", Test1.class.getName())
                     .shouldHaveExitValue(0)
                     .shouldContain("callbackClassUnload called");
     }

test/jdk/com/sun/management/DiagnosticCommandMBean/DcmdMBeanTestCheckJni.java

@@ -45,7 +45,7 @@
 public class DcmdMBeanTestCheckJni {
 
     public static void main(String[] args) throws Exception {
-        OutputAnalyzer out = ProcessTools.executeTestJvm(
+        OutputAnalyzer out = ProcessTools.executeTestJava(
             "-Xcheck:jni",
             DcmdMBeanRunner.class.getName());
         out.shouldNotMatch("WARNING: JNI local refs: \\d+, exceeds capacity: \\d+\\s+" +