Skip to content

Commit bcb907b

Browse files
GoeLinGoeLin
committed
Backport e7ebae54a7e0250cb9f645bd2bdc04a60f6b0cba
1 parent d50fbcd commit bcb907b

File tree

78 files changed

+236
-164
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+236
-164
lines changed

‎test/hotspot/jtreg/compiler/c2/cr7200264/TestDriver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public void run() throws Throwable {
4444
}
4545

4646
private List<String> executeApplication() throws Throwable {
47-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
47+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
4848
"-Xbatch",
4949
"-XX:-TieredCompilation",
5050
"-XX:+PrintCompilation",

‎test/hotspot/jtreg/compiler/ciReplay/CiReplayBase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@ static void test(int i) {
9292

9393
static {
9494
try {
95-
CLIENT_VM_AVAILABLE = ProcessTools.executeTestJvm(CLIENT_VM_OPTION, VERSION_OPTION)
95+
CLIENT_VM_AVAILABLE = ProcessTools.executeTestJava(CLIENT_VM_OPTION, VERSION_OPTION)
9696
.getOutput().contains("Client");
97-
SERVER_VM_AVAILABLE = ProcessTools.executeTestJvm(SERVER_VM_OPTION, VERSION_OPTION)
97+
SERVER_VM_AVAILABLE = ProcessTools.executeTestJava(SERVER_VM_OPTION, VERSION_OPTION)
9898
.getOutput().contains("Server");
9999
} catch(Throwable t) {
100100
throw new Error("Initialization failed: " + t, t);

‎test/hotspot/jtreg/compiler/compilercontrol/commands/OptionTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,49 +36,49 @@
3636

3737
public class OptionTest {
3838
public static void main(String[] args) throws Exception {
39-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,package/class,ccstrlist,ControlIntrinsic,+_id", "-version")
39+
ProcessTools.executeTestJava("-XX:CompileCommand=option,package/class,ccstrlist,ControlIntrinsic,+_id", "-version")
4040
.shouldHaveExitValue(0)
4141
.shouldContain("CompileCommand: An error occurred during parsing")
4242
.shouldContain("Error: Did not specify any method name")
4343
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
4444

45-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,*,ccstrlist,ControlIntrinsic,+_id", "-version")
45+
ProcessTools.executeTestJava("-XX:CompileCommand=option,*,ccstrlist,ControlIntrinsic,+_id", "-version")
4646
.shouldHaveExitValue(0)
4747
.shouldContain("CompileCommand: An error occurred during parsing")
4848
.shouldContain("Error: Did not specify any method name")
4949
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
5050

5151
// corner case:
5252
// ccstrlist could be a valid method name, so it is accepted in the well-formed case.
53-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,*.ccstrlist,ccstrlist,ControlIntrinsic,+_id", "-version")
53+
ProcessTools.executeTestJava("-XX:CompileCommand=option,*.ccstrlist,ccstrlist,ControlIntrinsic,+_id", "-version")
5454
.shouldContain("CompileCommand: ControlIntrinsic *.ccstrlist const char* ControlIntrinsic")
5555
.shouldHaveExitValue(0)
5656
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
5757

58-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,*.*,ccstrlist,ControlIntrinsic,+_id", "-version")
58+
ProcessTools.executeTestJava("-XX:CompileCommand=option,*.*,ccstrlist,ControlIntrinsic,+_id", "-version")
5959
.shouldContain("CompileCommand: ControlIntrinsic *.* const char* ControlIntrinsic")
6060
.shouldHaveExitValue(0)
6161
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
6262

63-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,class,PrintIntrinsics", "-version")
63+
ProcessTools.executeTestJava("-XX:CompileCommand=option,class,PrintIntrinsics", "-version")
6464
.shouldHaveExitValue(0)
6565
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
6666

6767
// corner case:
6868
// PrintIntrinsics could be a valid method name, so it is accepted in the well-formed case.
69-
ProcessTools.executeTestJvm("-XX:CompileCommand=option,class.PrintIntrinsics,PrintIntrinsics", "-version")
69+
ProcessTools.executeTestJava("-XX:CompileCommand=option,class.PrintIntrinsics,PrintIntrinsics", "-version")
7070
.shouldContain("CompileCommand: PrintIntrinsics class.PrintIntrinsics bool PrintIntrinsics = true")
7171
.shouldHaveExitValue(0)
7272
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
7373

7474
// corner case:
7575
// _dontinline_* is a valid method pattern, so it should be accepted
76-
ProcessTools.executeTestJvm("-XX:CompileCommand=dontinline,*::dontinline_*", "-version")
76+
ProcessTools.executeTestJava("-XX:CompileCommand=dontinline,*::dontinline_*", "-version")
7777
.shouldContain("CompileCommand: dontinline *.dontinline_* bool dontinline = true")
7878
.shouldHaveExitValue(0)
7979
.shouldNotContain("# A fatal error has been detected by the Java Runtime Environment");
8080

81-
ProcessTools.executeTestJvm("-XX:CompileCommand=dontinline,*.dontinline", "-version")
81+
ProcessTools.executeTestJava("-XX:CompileCommand=dontinline,*.dontinline", "-version")
8282
.shouldContain("CompileCommand: dontinline *.dontinline bool dontinline = true")
8383
.shouldHaveExitValue(0)
8484
.shouldNotContain("Error: Did not specify any method name")

‎test/hotspot/jtreg/compiler/compilercontrol/parser/HugeDirectiveUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private static List<String> getRandomDescriptors(
121121
protected static OutputAnalyzer execute(String fileName) {
122122
OutputAnalyzer output;
123123
try {
124-
output = ProcessTools.executeTestJvm(
124+
output = ProcessTools.executeTestJava(
125125
"-XX:+UnlockDiagnosticVMOptions",
126126
"-XX:CompilerDirectivesLimit=1000",
127127
"-XX:CompilerDirectivesFile=" + fileName,

‎test/hotspot/jtreg/compiler/compilercontrol/parser/TestCompileOnly.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception {
4646
}
4747

4848
public static void test(String compileOnlyCommand) throws Exception {
49-
OutputAnalyzer output = ProcessTools.executeTestJvm("-XX:CompileOnly=" + compileOnlyCommand, "-version");
49+
OutputAnalyzer output = ProcessTools.executeTestJava("-XX:CompileOnly=" + compileOnlyCommand, "-version");
5050
output.shouldHaveExitValue(0);
5151
}
5252
}

‎test/hotspot/jtreg/compiler/compilercontrol/share/scenario/Executor.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public List<OutputAnalyzer> execute() {
105105
vmInputArgs.length + vmOptions.size());
106106
System.arraycopy(vmOptions.toArray(), 0, cmds, vmInputArgs.length,
107107
vmOptions.size());
108-
output = ProcessTools.executeTestJvm(cmds);
108+
output = ProcessTools.executeTestJava(cmds);
109109
} catch (Throwable thr) {
110110
throw new Error("Execution failed: " + thr.getMessage(), thr);
111111
}

‎test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ private boolean isTieredLevelGreaterThan(int level) {
7272
* @throws Throwable
7373
*/
7474
private void testUseAES() throws Throwable {
75-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
75+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
7676
prepareArguments(prepareBooleanFlag(AESIntrinsicsBase
7777
.USE_AES, true)));
7878
final String errorMessage = "Case testUseAES failed";
@@ -103,7 +103,7 @@ private void testUseAES() throws Throwable {
103103
*/
104104
private void testUseAESUseSSE2() throws Throwable {
105105
if (Platform.isX86() || Platform.isX64()) {
106-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
106+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
107107
prepareArguments(prepareBooleanFlag(AESIntrinsicsBase
108108
.USE_AES_INTRINSICS, true),
109109
prepareNumericFlag(AESIntrinsicsBase.USE_SSE, 2)));
@@ -132,7 +132,7 @@ private void testUseAESUseSSE2() throws Throwable {
132132
*/
133133
private void testNoUseAESUseSSE2() throws Throwable {
134134
if (Platform.isX86() || Platform.isX64()) {
135-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
135+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
136136
prepareArguments(prepareBooleanFlag(AESIntrinsicsBase
137137
.USE_AES, false),
138138
prepareNumericFlag(AESIntrinsicsBase.USE_SSE, 2)));
@@ -158,7 +158,7 @@ private void testNoUseAESUseSSE2() throws Throwable {
158158
* @throws Throwable
159159
*/
160160
private void testNoUseAES() throws Throwable {
161-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
161+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
162162
prepareArguments(prepareBooleanFlag(AESIntrinsicsBase
163163
.USE_AES, false)));
164164
final String errorMessage = "Case testNoUseAES failed";
@@ -180,7 +180,7 @@ private void testNoUseAES() throws Throwable {
180180
* @throws Throwable
181181
*/
182182
private void testNoUseAESIntrinsic() throws Throwable {
183-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
183+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
184184
prepareArguments(prepareBooleanFlag(AESIntrinsicsBase
185185
.USE_AES_INTRINSICS, false)));
186186
final String errorMessage = "Case testNoUseAESIntrinsic failed";

‎test/hotspot/jtreg/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ protected void runTestCases() throws Throwable {
6565
* @throws Throwable
6666
*/
6767
private void testUseAESIntrinsics() throws Throwable {
68-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
68+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
6969
AESIntrinsicsBase.prepareArguments(prepareBooleanFlag(
7070
AESIntrinsicsBase.USE_AES_INTRINSICS, true)));
7171
final String errorMessage = "Case testUseAESIntrinsics failed";
@@ -89,7 +89,7 @@ private void testUseAESIntrinsics() throws Throwable {
8989
* @throws Throwable
9090
*/
9191
private void testUseAES() throws Throwable {
92-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(
92+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(
9393
AESIntrinsicsBase.prepareArguments(prepareBooleanFlag
9494
(AESIntrinsicsBase.USE_AES, true)));
9595
final String errorMessage = "Case testUseAES failed";

‎test/hotspot/jtreg/compiler/gcbarriers/TestMembarDependencies.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class TestMembarDependencies {
4343
public static void main(String args[]) throws Exception {
4444
if (args.length == 0) {
4545
// For debugging, add "-XX:+TraceOptoPipelining"
46-
OutputAnalyzer oa = ProcessTools.executeTestJvm("-XX:+IgnoreUnrecognizedVMOptions",
46+
OutputAnalyzer oa = ProcessTools.executeTestJava("-XX:+IgnoreUnrecognizedVMOptions",
4747
"-XX:-TieredCompilation", "-XX:-BackgroundCompilation", "-XX:+PrintOpto",
4848
"-XX:CompileCommand=compileonly,compiler.membars.TestMembarDependencies::test*",
4949
"-XX:CompileCommand=dontinline,compiler.membars.TestMembarDependencies::test_m1",

‎test/hotspot/jtreg/compiler/intrinsics/bmi/BMITestRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static OutputAnalyzer runTest(Class<? extends Expr> expr,
146146
new Integer(iterations).toString()
147147
});
148148

149-
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJvm(vmOpts);
149+
OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(vmOpts);
150150

151151
outputAnalyzer.shouldHaveExitValue(0);
152152

0 commit comments

Comments
 (0)