From 6c552a7b42e73174343280d46bd72d730c42b5c5 Mon Sep 17 00:00:00 2001 From: Igor Ignatyev Date: Thu, 10 Jun 2021 13:03:29 +0000 Subject: [PATCH] 8268544: some runtime/sealedClasses tests should be run in driver mode Reviewed-by: hseigel --- .../runtime/sealedClasses/RedefinePermittedSubclass.java | 5 +++-- .../jtreg/runtime/sealedClasses/RedefineSealedClass.java | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/hotspot/jtreg/runtime/sealedClasses/RedefinePermittedSubclass.java b/test/hotspot/jtreg/runtime/sealedClasses/RedefinePermittedSubclass.java index e2cc20783b2..da7941cb67c 100644 --- a/test/hotspot/jtreg/runtime/sealedClasses/RedefinePermittedSubclass.java +++ b/test/hotspot/jtreg/runtime/sealedClasses/RedefinePermittedSubclass.java @@ -31,8 +31,8 @@ * @modules java.instrument * @requires vm.jvmti * @compile RedefinePermittedSubclass.java - * @run main/othervm RedefinePermittedSubclass buildagent - * @run main/othervm/timeout=6000 RedefinePermittedSubclass runtest + * @run driver RedefinePermittedSubclass buildagent + * @run driver/timeout=6000 RedefinePermittedSubclass runtest */ import java.io.FileNotFoundException; @@ -128,6 +128,7 @@ public class RedefinePermittedSubclass { ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(javaArgs1); OutputAnalyzer output = new OutputAnalyzer(pb.start()); output.shouldNotContain("processing of -javaagent failed"); + output.shouldHaveExitValue(0); } } } diff --git a/test/hotspot/jtreg/runtime/sealedClasses/RedefineSealedClass.java b/test/hotspot/jtreg/runtime/sealedClasses/RedefineSealedClass.java index ccea8aa9eec..8215e8b2b79 100644 --- a/test/hotspot/jtreg/runtime/sealedClasses/RedefineSealedClass.java +++ b/test/hotspot/jtreg/runtime/sealedClasses/RedefineSealedClass.java @@ -30,8 +30,8 @@ * @modules java.instrument * @requires vm.jvmti * @compile RedefineSealedClass.java - * @run main/othervm RedefineSealedClass buildagent - * @run main/othervm/timeout=6000 RedefineSealedClass runtest + * @run driver RedefineSealedClass buildagent + * @run driver/timeout=6000 RedefineSealedClass runtest */ import java.io.FileNotFoundException; @@ -110,6 +110,7 @@ public class RedefineSealedClass { ProcessBuilder pb = ProcessTools.createJavaProcessBuilder(javaArgs1); OutputAnalyzer output = new OutputAnalyzer(pb.start()); output.shouldNotContain("processing of -javaagent failed"); + output.shouldHaveExitValue(0); } } }