mirrors/JetBrainsRuntime
1
0
Fork 0
mirror of https://github.com/JetBrains/JetBrainsRuntime.git synced 2026-01-09 10:01:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

JBR-6247 Update JBR-specific tests after JDK-8314823

Browse Source 
(cherry picked from commit 791448a24d)
This commit is contained in:
Maxim Kartashev
2023-10-30 13:22:15 +04:00
committed by Vitaly Provodin
parent bc17627a31
commit b5310884a7
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/hotspot/jtreg/runtime/JBR-3923/Test.java
View File

@@ -40,7 +40,7 @@ public class Test {
public static void main(String[] args) throws Exception {
String jarFile = System.getProperty("test.src") + "/testcase.jar";
ProcessBuilder pb = ProcessTools.createJavaProcessBuilder("-cp", jarFile,
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder("-cp", jarFile,
"-XX:+UnlockDiagnosticVMOptions",
"-Xcomp",
"-XX:CompileCommand=compileonly,MainKt::test",

2
test/hotspot/jtreg/runtime/jni/loadLibraryUnicode/LoadLibraryUnicodeTest.java
View File

@@ -37,7 +37,7 @@ public class LoadLibraryUnicodeTest {
public static void main(String args[]) throws Exception {
String nativePathSetting = "-Dtest.nativepath=" + getSystemProperty("test.nativepath");
ProcessBuilder pb = ProcessTools.createTestJvm(nativePathSetting, LoadLibraryUnicode.class.getName());
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(nativePathSetting, LoadLibraryUnicode.class.getName());
pb.environment().put("LC_ALL", "en_US.UTF-8");
ProcessTools.executeProcess(pb)
.outputTo(System.out)

16
test/jdk/java/awt/Debug/X11Trace.java
View File

@@ -28,6 +28,7 @@
* @library /test/lib
* @run main X11Trace
*/
import java.awt.AWTException;
import javax.swing.JFrame;
import javax.swing.SwingUtilities;
@@ -36,6 +37,7 @@ import java.nio.file.Files;
import java.nio.file.Paths;
import java.nio.charset.StandardCharsets;
import java.util.stream.Stream;
import jdk.test.lib.process.ProcessTools;
import jdk.test.lib.process.OutputAnalyzer;
@@ -44,13 +46,19 @@ public class X11Trace {
if (args.length > 0 && args[0].equals("runtest")) {
runTest();
} else {
OutputAnalyzer oa = ProcessTools.executeTestJvm("-Dsun.awt.x11.trace=log,timestamp,stats,td=0", X11Trace.class.getName(), "runtest");
OutputAnalyzer oa = new OutputAnalyzer(
ProcessTools.createTestJavaProcessBuilder("-Dsun.awt.x11.trace=log,timestamp,stats,td=0", X11Trace.class.getName(), "runtest")
.start());
oa.shouldContain("held AWT lock for").shouldContain("AWT Lock usage statistics").shouldHaveExitValue(0);
oa = ProcessTools.executeTestJvm("-Dsun.awt.x11.trace=log", X11Trace.class.getName(), "runtest");
oa = new OutputAnalyzer(
ProcessTools.createTestJavaProcessBuilder("-Dsun.awt.x11.trace=log", X11Trace.class.getName(), "runtest")
.start());
oa.shouldContain("held AWT lock for").shouldNotContain("AWT Lock usage statistics").shouldHaveExitValue(0);
oa = ProcessTools.executeTestJvm("-Dsun.awt.x11.trace=log,timestamp,stats,td=0,out:mylog", X11Trace.class.getName(), "runtest");
oa = new OutputAnalyzer(
ProcessTools.createTestJavaProcessBuilder("-Dsun.awt.x11.trace=log,timestamp,stats,td=0,out:mylog", X11Trace.class.getName(), "runtest")
.start());
oa.shouldHaveExitValue(0).stderrShouldBeEmpty();
final String logFileContents = Files.readString(Paths.get("mylog"));
@@ -62,7 +70,7 @@ public class X11Trace {
public static void delay(int ms) {
try {
Thread.sleep(ms);
} catch(InterruptedException e) {
} catch (InterruptedException e) {
}
}

4
test/jdk/jb/hotspot/AbortHandler.java
View File

@@ -74,7 +74,7 @@ public class AbortHandler {
}
opts.add("AbortHandler");
opts.add("--test");
ProcessBuilder pb = ProcessTools.createTestJvm(opts);
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(opts);
if (pb.command().contains("-Djbr.catch.SIGABRT=true")) {
System.out.println("Test is being executed with -Djbr.catch.SIGABRT=true.");
System.out.println("Skipping verification that hs_err is not generated.");
@@ -95,7 +95,7 @@ public class AbortHandler {
opts.add("-Djbr.catch.SIGABRT=true");
opts.add("AbortHandler");
opts.add("--test");
ProcessBuilder pb = ProcessTools.createTestJvm(opts);
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(opts);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.shouldNotContain(MARKER_TEXT);

2
test/jdk/jb/hotspot/JNIRefsInCrashLog.java
View File

@@ -62,7 +62,7 @@ public class JNIRefsInCrashLog {
opts.add("-XX:+ErrorFileToStdout");
opts.add(JNIRefsInCrashLog.class.getName());
opts.add("--test");
ProcessBuilder pb = ProcessTools.createTestJvm(opts);
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(opts);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.outputTo(System.out);
output.shouldContain("JNI global refs memory usage:");

2
test/jdk/jb/hotspot/OOMEStacksInCrashLog.java
View File

@@ -107,7 +107,7 @@ public class OOMEStacksInCrashLog {
opts.add("-XX:+ErrorFileToStdout");
opts.add(OOMEStacksInCrashLog.class.getName());
opts.add("--test");
ProcessBuilder pb = ProcessTools.createTestJvm(opts);
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(opts);
OutputAnalyzer output = new OutputAnalyzer(pb.start());
output.outputTo(System.out);
output.shouldContain("OOME stack traces (most recent first)");

2
test/jdk/jb/java/awt/Font/LibrariesCheck.java
View File

@@ -59,7 +59,7 @@ public class LibrariesCheck {
Path jdkLibPath = Platform.libDir();
Files.copy(jdkLibPath.resolve(testLibName), testLibPath);
ProcessBuilder pb = ProcessTools.createTestJvm(
ProcessBuilder pb = ProcessTools.createTestJavaProcessBuilder(
LibrariesCheck.class.getName(),
"runtest");