upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-02-25 19:04:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

'uname -o' is not portable, suppress error message; remove spurious cat tmp.out; provide forensics for failure analysis

Browse source
This commit is contained in:
Mark Andrews 2017-08-15 18:02:24 +10:00
parent 9ce1a8e93b
commit e85a2c5624
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bin/tests/system/metadata/clean.sh
View file

@ -12,4 +12,5 @@ rm -f pending.key rolling.key standby.key inact.key
rm -f prerev.key postrev.key oldstyle.key
rm -f keys sigs
rm -f tmp.out
rm -f settime1.test* settime2.test*
rm -f ns*/named.lock

15
bin/tests/system/metadata/tests.sh
View file

@ -14,7 +14,7 @@ SYSTEMTESTTOP=..
pzone=parent.nil pfile=parent.db
czone=child.parent.nil cfile=child.db
status=0
n=0
n=1
echo "I:setting key timers"
$SETTIME -A now+15s `cat rolling.key` > /dev/null
@ -137,18 +137,17 @@ if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
echo "I:checking warning about permissions change on key with dnssec-settime ($n)"
if [ `uname -o` == Cygwin ]; then
uname=`uname -o 2> /dev/null`
if [ Cygwin == "$uname" ]; then
echo "I: Cygwin detected, skipping"
else
ret=0
# settime should print a warning about changing the permissions
chmod 644 `cat oldstyle.key`.private
$SETTIME -P none `cat oldstyle.key` > tmp.out 2>&1 || ret=1
grep "warning" tmp.out > /dev/null 2>&1 || ret=1
cat tmp.out
$SETTIME -P none `cat oldstyle.key` > tmp.out 2>&1 || ret=1
grep "warning" tmp.out > /dev/null 2>&1 && ret=1
cat tmp.out
$SETTIME -P none `cat oldstyle.key` > settime1.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime1.test$n > /dev/null 2>&1 || ret=1
$SETTIME -P none `cat oldstyle.key` > settime2.test$n 2>&1 || ret=1
grep "warning: Permissions on the file.*have changed" settime2.test$n > /dev/null 2>&1 && ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`