Mercurial > hg > release > icedtea7-forest-2.3 > jdk
changeset 6136:0cda40f881f6
7140868: TEST_BUG: jcmd tests need to use -XX:+UsePerfData
Reviewed-by: fparain, dholmes
| author | fparain |
|---|---|
| date | Tue, 14 Feb 2012 07:28:29 -0800 |
| parents | f2ce22226ca2 |
| children | dd05955627f9 |
| files | test/sun/tools/jcmd/jcmd-Defaults.sh test/sun/tools/jcmd/jcmd-f.sh test/sun/tools/jcmd/jcmd-help-help.sh test/sun/tools/jcmd/jcmd-help.sh test/sun/tools/jcmd/jcmd-pid.sh |
| diffstat | 5 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/test/sun/tools/jcmd/jcmd-Defaults.sh Wed Feb 20 17:07:30 2013 +0000 +++ b/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/test/sun/tools/jcmd/jcmd-f.sh Wed Feb 20 17:07:30 2013 +0000 +++ b/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/test/sun/tools/jcmd/jcmd-help-help.sh Wed Feb 20 17:07:30 2013 +0000 +++ b/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/test/sun/tools/jcmd/jcmd-help.sh Wed Feb 20 17:07:30 2013 +0000 +++ b/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/test/sun/tools/jcmd/jcmd-pid.sh Wed Feb 20 17:07:30 2013 +0000 +++ b/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