From 1041efe0271a826a3c8a185c8ecfc3e8b11cff9c Mon Sep 17 00:00:00 2001
From: Igor Ignatyev <iignatyev@openjdk.org>
Date: Mon, 27 Apr 2020 22:24:54 -0700
Subject: [PATCH] 8243946: serviceability/sa and jvmti tests fail after
 JDK-8243928

Reviewed-by: dholmes, mikael, sspitsyn
---
 .../jvmti/CanGenerateAllClassHook/CanGenerateAllClassHook.java  | 2 +-
 .../jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java      | 2 +-
 test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassHook/CanGenerateAllClassHook.java b/test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassHook/CanGenerateAllClassHook.java
index 0142756e28f..892663b5264 100644
--- a/test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassHook/CanGenerateAllClassHook.java
+++ b/test/hotspot/jtreg/serviceability/jvmti/CanGenerateAllClassHook/CanGenerateAllClassHook.java
@@ -30,7 +30,7 @@
  * @requires vm.cds
  * @library /test/lib
  * @compile CanGenerateAllClassHook.java
- * @run driver/native CanGenerateAllClassHook
+ * @run main/native CanGenerateAllClassHook
  */
 
 import jdk.test.lib.cds.CDSTestUtils;
diff --git a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
index 6bfa92d13b0..1a4805e9b56 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestCpoolForInvokeDynamic.java
@@ -52,7 +52,7 @@ import jdk.test.lib.Utils;
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
  *          jdk.hotspot.agent/sun.jvm.hotspot.debugger
  *          jdk.hotspot.agent/sun.jvm.hotspot.ui.classbrowser
- * @run driver TestCpoolForInvokeDynamic
+ * @run main TestCpoolForInvokeDynamic
  */
 
 public class TestCpoolForInvokeDynamic {
diff --git a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
index 0e4fd583002..a4cff83228c 100644
--- a/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
+++ b/test/hotspot/jtreg/serviceability/sa/TestDefaultMethods.java
@@ -50,7 +50,7 @@ import jdk.test.lib.Utils;
  *          jdk.hotspot.agent/sun.jvm.hotspot.utilities
  *          jdk.hotspot.agent/sun.jvm.hotspot.oops
  *          jdk.hotspot.agent/sun.jvm.hotspot.debugger
- * @run driver TestDefaultMethods
+ * @run main TestDefaultMethods
  */
 
 public class TestDefaultMethods {