Mercurial > hg > openjdk > jigsaw > jdk
changeset 7036:5772e9edbc4c
8008352: java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh fails on MKS
Summary: Use more portable pattern counting constructs in test driver.
Reviewed-by: sspitsyn, sla, coleenp
| author | dcubed |
|---|---|
| date | Wed, 20 Feb 2013 13:23:56 -0800 |
| parents | 0a2b308cc82d |
| children | 1da987f0311a |
| files | test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh |
| diffstat | 1 files changed, 12 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Wed Feb 20 16:39:35 2013 +0400 +++ b/test/java/lang/instrument/RedefineSubclassWithTwoInterfaces.sh Wed Feb 20 13:23:56 2013 -0800 @@ -141,32 +141,30 @@ 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."