stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8330621: Make 5 compiler tests use ProcessTools.executeProcess

Browse Source 
Reviewed-by: chagedorn, stefank, thartmann
This commit is contained in:
Evgeny Nikitin 2024-04-22 07:41:06 +00:00 committed by Tobias Hartmann
parent 20546c1ea0
commit 5394f57f00
5 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/hotspot/jtreg/compiler/c2/Test7068051.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,7 @@ package compiler.c2;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.IOException;
import java.io.InputStream;
@ -133,11 +134,10 @@ public class Test7068051 {
for (String p : params) {
jar.addToolArg(p);
}
ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
try {
OutputAnalyzer output = new OutputAnalyzer(pb.start());
OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
output.shouldHaveExitValue(0);
} catch (IOException ex) {
} catch (Exception ex) {
throw new AssertionError("TESTBUG: jar failed.", ex);
}
}

7
test/hotspot/jtreg/compiler/c2/unloaded/TestInlineUnloaded.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -56,6 +56,7 @@ package compiler.c2.unloaded;
import jdk.test.lib.JDKToolFinder;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.IOException;
import java.net.URL;
@ -179,7 +180,7 @@ public class TestInlineUnloaded {
}
}
static void run(String testCaseName, Consumer<OutputAnalyzer> processor) throws IOException {
static void run(String testCaseName, Consumer<OutputAnalyzer> processor) throws Exception {
ProcessBuilder pb = new ProcessBuilder();
pb.command(JDKToolFinder.getJDKTool("java"),
@ -192,7 +193,7 @@ public class TestInlineUnloaded {
System.out.println("Command line: [" + pb.command() + "]");
OutputAnalyzer analyzer = new OutputAnalyzer(pb.start());
OutputAnalyzer analyzer = ProcessTools.executeProcess(pb);
analyzer.shouldHaveExitValue(0);

6
test/hotspot/jtreg/compiler/jsr292/NonInlinedCall/Agent.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,6 +25,7 @@ package compiler.jsr292.NonInlinedCall;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.File;
import java.io.PrintStream;
@ -51,8 +52,7 @@ public class Agent {
System.out.println("Running jar " + Arrays.toString(jar.getCommand()));
ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
OutputAnalyzer output = new OutputAnalyzer(pb.start());
OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
output.shouldHaveExitValue(0);
}
}

8
test/hotspot/jtreg/compiler/profiling/spectrapredefineclass/Launcher.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -41,6 +41,7 @@ package compiler.profiling.spectrapredefineclass;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.File;
import java.io.IOException;
@ -60,11 +61,10 @@ public class Launcher {
.addToolArg(Agent.AGENT_JAR)
.addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
try {
OutputAnalyzer output = new OutputAnalyzer(pb.start());
OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
output.shouldHaveExitValue(0);
} catch (IOException ex) {
} catch (Exception ex) {
throw new Error("TESTBUG: jar failed.", ex);
}
}

8
test/hotspot/jtreg/compiler/profiling/spectrapredefineclass_classloaders/Launcher.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -44,6 +44,7 @@ package compiler.profiling.spectrapredefineclass_classloaders;
import jdk.test.lib.JDKToolLauncher;
import jdk.test.lib.process.OutputAnalyzer;
import jdk.test.lib.process.ProcessTools;
import java.io.File;
import java.io.IOException;
@ -63,11 +64,10 @@ public class Launcher {
.addToolArg(Agent.AGENT_JAR)
.addToolArg(Agent.class.getName().replace('.', File.separatorChar) + ".class");
ProcessBuilder pb = new ProcessBuilder(jar.getCommand());
try {
OutputAnalyzer output = new OutputAnalyzer(pb.start());
OutputAnalyzer output = ProcessTools.executeProcess(jar.getCommand());
output.shouldHaveExitValue(0);
} catch (IOException ex) {
} catch (Exception ex) {
throw new Error("TESTBUG: jar failed.", ex);
}
}