Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 11741:fb5ff982fbc4
8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
Reviewed-by: dsamersoff, sla
Contributed-by: mattias.tobiasson@oracle.com
| author | ykantser |
|---|---|
| date | Fri, 22 Jan 2016 18:04:34 +0300 |
| parents | 4836938f0ef9 |
| children | afcbabfb116d |
| files | test/com/sun/jdi/JdbReadTwiceTest.sh |
| diffstat | 1 files changed, 29 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/test/com/sun/jdi/JdbReadTwiceTest.sh Fri Jan 22 17:58:06 2016 +0300 +++ b/test/com/sun/jdi/JdbReadTwiceTest.sh Fri Jan 22 18:04:34 2016 +0300 @@ -204,27 +204,37 @@ clean fi +echo +echo "+++++++++++++++++++++++++++++++++++" +echo "Read an unreadable file - verify the read fails." -if [ ! -r c:/ ] ; then - # Can't make a file unreadable under MKS. - echo - echo "+++++++++++++++++++++++++++++++++++" - echo "Read an unreadable file - verify the read fails." - # If the file exists, we try to read it. The - # read will fail. - mkFiles $HOME/jdb.ini - id > $HOME/jdb.ini - chmod a-r $HOME/jdb.ini - if grep -q "uid=" $HOME/jdb.ini ; then - echo "Unable to make file unreadable, so test will fail. chmod: $HOME/jdb.ini" - if grep -q "uid=0" $HOME/jdb.ini ; then - echo "The test is running as root. Fix infrastructure!" - fi - fi +canMakeUnreadable=No +id > $HOME/jdb.ini +if chmod a-r $HOME/jdb.ini +then + grep -q 'uid=0(' $HOME/jdb.ini 2> /dev/null + case $? in + 0) + echo "Error! Can't make file unreadable running as root" + ;; + 1) + echo "Error! Can't make file unreadable for some other reason (windows?)" + ;; + *) + echo "OK. the file is unreadable" + canMakeUnreadable=Yes + ;; + esac +else + echo "Error! Can't create or chmod file" +fi + +if [ "$canMakeUnreadable" = "Yes" ] +then doit failIfNot 1 "open: $HOME/jdb.ini" - clean fi +clean echo @@ -246,8 +256,8 @@ doit failIfNot 1 "from $fred" - if [ ! -r c:/ ] ; then - # Can't make a file unreadable under MKS + if [ "$canMakeUnreadable" = "Yes" ] + then chmod a-r $fred doit failIfNot 1 "open: $fred"