8273187: jtools tests fail with missing markerName check
Reviewed-by: iris, sspitsyn, joehw
This commit is contained in:
parent
6f3e40c16d
commit
f71df142a9
@ -813,9 +813,6 @@ sun/tools/jstat/jstatLineCounts2.sh 8268211 linux-aa
|
||||
sun/tools/jstat/jstatLineCounts3.sh 8268211 linux-aarch64
|
||||
sun/tools/jstat/jstatLineCounts4.sh 8268211 linux-aarch64
|
||||
|
||||
sun/tools/jcmd/JcmdOutputEncodingTest.java 8273187 generic-all
|
||||
sun/tools/jstack/BasicJStackTest.java 8273187 generic-all
|
||||
|
||||
############################################################################
|
||||
|
||||
# jdk_other
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2019, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2019, 2021, 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
|
||||
@ -21,7 +21,6 @@
|
||||
* questions.
|
||||
*/
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.nio.charset.Charset;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
|
||||
@ -32,7 +31,7 @@ import jdk.test.lib.JDKToolLauncher;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8222491
|
||||
* @bug 8222491 8273187
|
||||
* @summary Tests if we handle the encoding of jcmd output correctly.
|
||||
* @library /test/lib
|
||||
* @run main JcmdOutputEncodingTest
|
||||
@ -51,6 +50,7 @@ public class JcmdOutputEncodingTest {
|
||||
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jcmd");
|
||||
launcher.addVMArgs(Utils.getTestJavaOpts());
|
||||
launcher.addVMArg("-Dfile.encoding=" + cs);
|
||||
launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
|
||||
launcher.addToolArg(Long.toString(ProcessTools.getProcessId()));
|
||||
launcher.addToolArg("Thread.print");
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2005, 2021, 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
|
||||
@ -32,6 +32,7 @@ import jdk.test.lib.JDKToolLauncher;
|
||||
|
||||
/*
|
||||
* @test
|
||||
* @bug 8273187
|
||||
* @summary Unit test for jstack utility
|
||||
* @library /test/lib
|
||||
* @run main BasicJStackTest
|
||||
@ -74,6 +75,7 @@ public class BasicJStackTest {
|
||||
launcher.addVMArgs(Utils.getFilteredTestJavaOpts("-XX:+UsePerfData"));
|
||||
launcher.addVMArg("-XX:+UsePerfData");
|
||||
launcher.addVMArg("-Dfile.encoding=" + cs);
|
||||
launcher.addVMArg("-Dsun.stdout.encoding=" + cs);
|
||||
if (toolArgs != null) {
|
||||
for (String toolArg : toolArgs) {
|
||||
launcher.addToolArg(toolArg);
|
||||
|
Loading…
x
Reference in New Issue
Block a user