Skip to content
Permalink
Browse files
8273187: jtools tests fail with missing markerName check
Reviewed-by: iris, sspitsyn, joehw
  • Loading branch information
naotoj committed Sep 20, 2021
1 parent 6f3e40c commit f71df142a97f522b40e90c3105e0e5bd8d5af9a2
Showing 3 changed files with 6 additions and 7 deletions.
@@ -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 @@

/*
* @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 @@ private static void testThreadDump() throws Exception {
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 @@

/*
* @test
* @bug 8273187
* @summary Unit test for jstack utility
* @library /test/lib
* @run main BasicJStackTest
@@ -74,6 +75,7 @@ private static OutputAnalyzer jstack(String marker, String... toolArgs) throws E
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);

1 comment on commit f71df14

@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented on f71df14 Sep 20, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.