Mercurial > hg > release > icedtea8-forest-3.0 > jdk
changeset 11739:70293223d553
8002116: This JdbReadTwiceTest.sh gets an exit 1
Summary: Explicitly check readability of file in question
Reviewed-by: sla, dholmes, olagneau
author | dsamersoff |
---|---|
date | Fri, 22 Jan 2016 16:12:17 +0300 |
parents | 0fdc333ccf86 |
children | 4836938f0ef9 |
files | test/com/sun/jdi/JdbReadTwiceTest.sh |
diffstat | 1 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/test/com/sun/jdi/JdbReadTwiceTest.sh Mon Jan 18 10:49:47 2016 -0800 +++ b/test/com/sun/jdi/JdbReadTwiceTest.sh Fri Jan 22 16:12:17 2016 +0300 @@ -213,10 +213,17 @@ # If the file exists, we try to read it. The # read will fail. mkFiles $HOME/jdb.ini - chmod a-r $HOME/jdb.ini - doit - failIfNot 1 "open: $HOME/jdb.ini" - clean + 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 + doit + failIfNot 1 "open: $HOME/jdb.ini" + clean fi