6380601: MISC_REGRESSION tests need to be more resilient to ps cmd problems
Reviewed-by: sla, alanb, jbachorik
This commit is contained in:
Katja Kantserova
parent
f7868d3299
commit
7175e6fe70
jdk/test/sun/tools
@ -1,82 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright (c) 2005, 2011, 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
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# @test
|
|
||||||
# @bug 6321286
|
|
||||||
# @summary Unit test for jmap utility
|
|
||||||
#
|
|
||||||
# @library ../common
|
|
||||||
# @build SimpleApplication ShutdownSimpleApplication
|
|
||||||
# @run shell Basic.sh
|
|
||||||
|
|
||||||
. ${TESTSRC}/../common/CommonSetup.sh
|
|
||||||
. ${TESTSRC}/../common/ApplicationSetup.sh
|
|
||||||
|
|
||||||
# Start application and use PORTFILE for coordination
|
|
||||||
PORTFILE="${TESTCLASSES}"/shutdown.port
|
|
||||||
startApplication SimpleApplication "${PORTFILE}"
|
|
||||||
|
|
||||||
# all return statuses are checked in this test
|
|
||||||
set +e
|
|
||||||
|
|
||||||
failed=0
|
|
||||||
|
|
||||||
# -histo[:live] option
|
|
||||||
${JMAP} -J-XX:+UsePerfData -histo $appJavaPid
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
${JMAP} -J-XX:+UsePerfData -histo:live $appJavaPid
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# -dump option
|
|
||||||
DUMPFILE="java_pid${appJavaPid}.hprof"
|
|
||||||
${JMAP} -J-XX:+UsePerfData -dump:format=b,file=${DUMPFILE} $appJavaPid
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# check that heap dump is parsable
|
|
||||||
${JHAT} -parseonly true ${DUMPFILE}
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# dump file is large so remove it
|
|
||||||
rm ${DUMPFILE}
|
|
||||||
|
|
||||||
# -dump:live option
|
|
||||||
${JMAP} -J-XX:+UsePerfData -dump:live,format=b,file=${DUMPFILE} $appJavaPid
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# check that heap dump is parsable
|
|
||||||
${JHAT} -parseonly true ${DUMPFILE}
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# dump file is large so remove it
|
|
||||||
rm -f ${DUMPFILE}
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
stopApplication "${PORTFILE}"
|
|
||||||
waitForApplication
|
|
||||||
|
|
||||||
exit $failed
|
|
||||||
99
jdk/test/sun/tools/jmap/BasicJMapTest.java
Normal file
99
jdk/test/sun/tools/jmap/BasicJMapTest.java
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2005, 2014, 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
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import static jdk.testlibrary.Asserts.*;
|
||||||
|
import jdk.testlibrary.JDKToolLauncher;
|
||||||
|
import jdk.testlibrary.OutputAnalyzer;
|
||||||
|
import jdk.testlibrary.ProcessTools;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 6321286
|
||||||
|
* @summary Unit test for jmap utility
|
||||||
|
* @library /lib/testlibrary
|
||||||
|
* @run main BasicJMapTest
|
||||||
|
*/
|
||||||
|
public class BasicJMapTest {
|
||||||
|
|
||||||
|
private static ProcessBuilder processBuilder = new ProcessBuilder();
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
testHisto();
|
||||||
|
testHistoLive();
|
||||||
|
testDump();
|
||||||
|
testDumpLive();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testHisto() throws Exception {
|
||||||
|
OutputAnalyzer output = jmap("-histo");
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testHistoLive() throws Exception {
|
||||||
|
OutputAnalyzer output = jmap("-histo:live");
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testDump() throws Exception {
|
||||||
|
File dump = new File("java_pid$" + ProcessTools.getProcessId() + ".hprof");
|
||||||
|
OutputAnalyzer output = jmap("-dump:format=b,file=" + dump.getName());
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
output.shouldContain("Heap dump file created");
|
||||||
|
verifyDumpFile(dump);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testDumpLive() throws Exception {
|
||||||
|
File dump = new File("java_pid$" + ProcessTools.getProcessId() + ".hprof");
|
||||||
|
OutputAnalyzer output = jmap("-dump:live,format=b,file=" + dump.getName());
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
output.shouldContain("Heap dump file created");
|
||||||
|
verifyDumpFile(dump);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void verifyDumpFile(File dump) {
|
||||||
|
assertTrue(dump.exists() && dump.isFile(), "Could not create dump file");
|
||||||
|
dump.delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static OutputAnalyzer jmap(String... toolArgs) throws Exception {
|
||||||
|
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jmap");
|
||||||
|
launcher.addVMArg("-XX:+UsePerfData");
|
||||||
|
if (toolArgs != null) {
|
||||||
|
for (String toolArg : toolArgs) {
|
||||||
|
launcher.addToolArg(toolArg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
launcher.addToolArg(Integer.toString(ProcessTools.getProcessId()));
|
||||||
|
|
||||||
|
processBuilder.command(launcher.getCommand());
|
||||||
|
System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
|
||||||
|
OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
|
||||||
|
System.out.println(output.getOutput());
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -1,60 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright (c) 2005, 2011, 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
|
|
||||||
# under the terms of the GNU General Public License version 2 only, as
|
|
||||||
# published by the Free Software Foundation.
|
|
||||||
#
|
|
||||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
|
||||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
||||||
# version 2 for more details (a copy is included in the LICENSE file that
|
|
||||||
# accompanied this code).
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License version
|
|
||||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
|
||||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
#
|
|
||||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
|
||||||
# or visit www.oracle.com if you need additional information or have any
|
|
||||||
# questions.
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
# @test
|
|
||||||
# @bug 6260070
|
|
||||||
# @summary Unit test for jstack utility
|
|
||||||
#
|
|
||||||
# @library ../common
|
|
||||||
# @build SimpleApplication ShutdownSimpleApplication
|
|
||||||
# @run shell Basic.sh
|
|
||||||
|
|
||||||
. ${TESTSRC}/../common/CommonSetup.sh
|
|
||||||
. ${TESTSRC}/../common/ApplicationSetup.sh
|
|
||||||
|
|
||||||
# Start application and use PORTFILE for coordination
|
|
||||||
PORTFILE="${TESTCLASSES}"/shutdown.port
|
|
||||||
startApplication SimpleApplication "${PORTFILE}"
|
|
||||||
|
|
||||||
# all return statuses are checked in this test
|
|
||||||
set +e
|
|
||||||
|
|
||||||
failed=0
|
|
||||||
|
|
||||||
# normal
|
|
||||||
$JSTACK -J-XX:+UsePerfData $appJavaPid 2>&1
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
# long
|
|
||||||
$JSTACK -J-XX:+UsePerfData -l $appJavaPid 2>&1
|
|
||||||
if [ $? != 0 ]; then failed=1; fi
|
|
||||||
|
|
||||||
set -e
|
|
||||||
|
|
||||||
stopApplication "${PORTFILE}"
|
|
||||||
waitForApplication
|
|
||||||
|
|
||||||
exit $failed
|
|
||||||
74
jdk/test/sun/tools/jstack/BasicJStackTest.java
Normal file
74
jdk/test/sun/tools/jstack/BasicJStackTest.java
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2005, 2014, 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
|
||||||
|
* under the terms of the GNU General Public License version 2 only, as
|
||||||
|
* published by the Free Software Foundation.
|
||||||
|
*
|
||||||
|
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||||
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||||
|
* version 2 for more details (a copy is included in the LICENSE file that
|
||||||
|
* accompanied this code).
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License version
|
||||||
|
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||||
|
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
*
|
||||||
|
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||||
|
* or visit www.oracle.com if you need additional information or have any
|
||||||
|
* questions.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
import jdk.testlibrary.JDKToolLauncher;
|
||||||
|
import jdk.testlibrary.OutputAnalyzer;
|
||||||
|
import jdk.testlibrary.ProcessTools;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* @test
|
||||||
|
* @bug 6260070
|
||||||
|
* @summary Unit test for jstack utility
|
||||||
|
* @library /lib/testlibrary
|
||||||
|
* @run main BasicJStackTest
|
||||||
|
*/
|
||||||
|
public class BasicJStackTest {
|
||||||
|
|
||||||
|
private static ProcessBuilder processBuilder = new ProcessBuilder();
|
||||||
|
|
||||||
|
public static void main(String[] args) throws Exception {
|
||||||
|
testJstackNoArgs();
|
||||||
|
testJstack_l();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testJstackNoArgs() throws Exception {
|
||||||
|
OutputAnalyzer output = jstack();
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void testJstack_l() throws Exception {
|
||||||
|
OutputAnalyzer output = jstack("-l");
|
||||||
|
output.shouldHaveExitValue(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static OutputAnalyzer jstack(String... toolArgs) throws Exception {
|
||||||
|
JDKToolLauncher launcher = JDKToolLauncher.createUsingTestJDK("jstack");
|
||||||
|
launcher.addVMArg("-XX:+UsePerfData");
|
||||||
|
if (toolArgs != null) {
|
||||||
|
for (String toolArg : toolArgs) {
|
||||||
|
launcher.addToolArg(toolArg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
launcher.addToolArg(Integer.toString(ProcessTools.getProcessId()));
|
||||||
|
|
||||||
|
processBuilder.command(launcher.getCommand());
|
||||||
|
System.out.println(Arrays.toString(processBuilder.command().toArray()).replace(",", ""));
|
||||||
|
OutputAnalyzer output = new OutputAnalyzer(processBuilder.start());
|
||||||
|
System.out.println(output.getOutput());
|
||||||
|
|
||||||
|
return output;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user