stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8008352: java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh fails on MKS

Browse Source 
Use more portable pattern counting constructs in test driver.

Reviewed-by: sspitsyn, sla, coleenp
This commit is contained in:
Daniel D. Daugherty 2013-02-20 13:23:56 -08:00
parent 29658bd3b4
commit 5eb01d191d
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jdk/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh
View File

@ -141,32 +141,30 @@ else
fi
PASS1_MESG="before any redefines"
cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l | sed 's/^ *//'`
case "$cnt" in
2)
cnt=`grep "$PASS1_MESG" output.log | grep 'version-0' | wc -l`
# no quotes around $cnt so any whitespace from 'wc -l' is ignored
if [ $cnt = 2 ]; then
echo "INFO: found 2 version-0 '$PASS1_MESG' mesgs."
;;
*)
else
echo "FAIL: did NOT find 2 version-0 '$PASS1_MESG' mesgs."
echo "INFO: cnt='$cnt'"
echo "INFO: grep '$PASS1_MESG' output:"
grep "$PASS1_MESG" output.log
result=1
;;
esac
fi
PASS2_MESG="after redefine"
cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l | sed 's/^ *//'`
case "$cnt" in
2)
cnt=`grep "$PASS2_MESG" output.log | grep 'version-1' | wc -l`
# no quotes around $cnt so any whitespace from 'wc -l' is ignored
if [ $cnt = 2 ]; then
echo "INFO: found 2 version-1 '$PASS2_MESG' mesgs."
;;
*)
else
echo "FAIL: did NOT find 2 version-1 '$PASS2_MESG' mesgs."
echo "INFO: cnt='$cnt'"
echo "INFO: grep '$PASS2_MESG' output:"
grep "$PASS2_MESG" output.log
result=1
;;
esac
fi
if [ "$result" = 0 ]; then
echo "PASS: test passed both positive and negative output checks."