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

(cherry picked from commit e85a2c5624)
This commit is contained in:
Mark Andrews
2017-08-15 18:09:07 +10:00
parent 4d89263d60
commit 78639b2ddf
2 changed files with 17 additions and 11 deletions
+1
View File
@@ -20,3 +20,4 @@ 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*
+16 -11
View File
@@ -22,7 +22,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
@@ -145,16 +145,21 @@ 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)"
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
$SETTIME -P none `cat oldstyle.key` > tmp.out 2>&1 || ret=1
grep "warning" tmp.out > /dev/null 2>&1 && ret=1
n=`expr $n + 1`
if [ $ret != 0 ]; then echo "I:failed"; fi
status=`expr $status + $ret`
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` > 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`
fi
echo "I:checking warning about delete date < inactive date with dnssec-settime ($n)"
ret=0