Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData
authorfparain
Tue, 14 Feb 2012 07:28:29 -0800
changeset 11845 38272d46e223
parent 11844 861c6a6c78de
child 11847 dbda165fcfb0
7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData Reviewed-by: fparain, dholmes
jdk/test/sun/tools/jcmd/jcmd-Defaults.sh file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jcmd/jcmd-f.sh file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jcmd/jcmd-help-help.sh file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jcmd/jcmd-help.sh file | annotate | diff | comparison | revisions
jdk/test/sun/tools/jcmd/jcmd-pid.sh file | annotate | diff | comparison | revisions 
--- a/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh	Tue Feb 14 11:47:41 2012 +0000
+++ b/jdk/test/sun/tools/jcmd/jcmd-Defaults.sh	Tue Feb 14 07:28:29 2012 -0800
@@ -28,6 +28,6 @@
 
 JCMD="${TESTJAVA}/bin/jcmd"
 
-${JCMD} 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
+${JCMD} -J-XX:+UsePerfData 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
 
-${JCMD} -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
+${JCMD} -J-XX:+UsePerfData -l 2>&1 | awk -f ${TESTSRC}/jcmd_Output1.awk
--- a/jdk/test/sun/tools/jcmd/jcmd-f.sh	Tue Feb 14 11:47:41 2012 +0000
+++ b/jdk/test/sun/tools/jcmd/jcmd-f.sh	Tue Feb 14 07:28:29 2012 -0800
@@ -46,7 +46,7 @@
 
 # -f <script>
 rm -f jcmd.out 2>/dev/null
-${JCMD} $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData $appJavaPid -f ${TESTSRC}/dcmd-script.txt | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
 echo jcmd.out
 diff -w jcmd.out ${TESTSRC}/help_help.out
 if [ $? != 0 ]; then
--- a/jdk/test/sun/tools/jcmd/jcmd-help-help.sh	Tue Feb 14 11:47:41 2012 +0000
+++ b/jdk/test/sun/tools/jcmd/jcmd-help-help.sh	Tue Feb 14 07:28:29 2012 -0800
@@ -46,7 +46,7 @@
 
 # help help
 rm -f jcmd.out 2>/dev/null
-${JCMD} $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData $appJavaPid help help | awk '{ if (NR>1) print $0;}' > jcmd.out 2>&1
 echo jcmd.out
 diff -w jcmd.out ${TESTSRC}/help_help.out
 if [ $? != 0 ]; then
--- a/jdk/test/sun/tools/jcmd/jcmd-help.sh	Tue Feb 14 11:47:41 2012 +0000
+++ b/jdk/test/sun/tools/jcmd/jcmd-help.sh	Tue Feb 14 07:28:29 2012 -0800
@@ -29,7 +29,7 @@
 JCMD="${TESTJAVA}/bin/jcmd"
 
 rm -f jcmd.out 2>/dev/null
-${JCMD} -h > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData -h > jcmd.out 2>&1
 
 diff -w jcmd.out ${TESTSRC}/usage.out
 if [ $? != 0 ]
@@ -40,7 +40,7 @@
 fi
 
 rm -f jcmd.out 2>/dev/null
-${JCMD} -help > jcmd.out 2>&1
+${JCMD} -J-XX:+UsePerfData -help > jcmd.out 2>&1
 
 diff -w jcmd.out ${TESTSRC}/usage.out
 if [ $? != 0 ]
--- a/jdk/test/sun/tools/jcmd/jcmd-pid.sh	Tue Feb 14 11:47:41 2012 +0000
+++ b/jdk/test/sun/tools/jcmd/jcmd-pid.sh	Tue Feb 14 07:28:29 2012 -0800
@@ -45,11 +45,11 @@
 failed=0
 
 # help command 
-${JCMD} $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk
+${JCMD} -J-XX:+UsePerfData $appJavaPid help 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output1.awk
 if [ $? != 0 ]; then failed=1; fi
 
 # PerfCounter.list option
-${JCMD} $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk
+${JCMD} -J-XX:+UsePerfData $appJavaPid PerfCounter.print 2>&1 | awk -f ${TESTSRC}/jcmd_pid_Output2.awk
 if [ $? != 0 ]; then failed=1; fi
 
 set -e
jdk-sandbox