fixed a test failure, some other shell cleanup

diff --git a/bin/tests/system/runtime/tests.sh b/bin/tests/system/runtime/tests.sh
index 1223f15a9e790a3d863a980dab087192683e2c19..c359fdf4c23971c3699881e90845d09d71e53073 100644 (file)
--- a/bin/tests/system/runtime/tests.sh
+++ b/bin/tests/system/runtime/tests.sh
@@ -24,7 +24,7 @@ kill_named() {
        fi
 
        pid=$(cat "${pidfile}" 2>/dev/null)
-       if test "${pid:+set}" = "set"; then
+       if [ "${pid:+set}" = "set" ]; then
                $KILL -15 "${pid}" >/dev/null 2>&1
                retries=10
                while [ "$retries" -gt 0 ]; do
@@ -68,7 +68,7 @@ ret=0
 [ -s ns2/named.pid ] || ret=1
 grep "unable to listen on any configured interface" ns2/named.run > /dev/null && ret=1
 grep "another named process" ns2/named.run > /dev/null && ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -76,7 +76,7 @@ echo_i "verifying that named checks for conflicting named processes ($n)"
 ret=0
 (cd ns2 && $NAMED -c named-alt2.conf -D runtime-ns2-extra-2 -X named.lock -m record,size,mctx -d 99 -g -U 4 >> named$n.run 2>&1 & )
 wait_for_named "another named process" ns2/named$n.run || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -86,7 +86,7 @@ ret=0
 wait_for_named "running$" ns2/named$n.run || ret=1
 grep "another named process" ns2/named$n.run > /dev/null && ret=1
 kill_named ns2/named-alt3.pid || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -97,7 +97,7 @@ $RNDCCMD 10.53.0.2 reconfig > rndc.out.$n 2>&1 && ret=1
 grep "failed: permission denied" rndc.out.$n > /dev/null 2>&1 || ret=1
 sleep 1
 grep "[^-]directory './nope' is not writable" ns2/named.run > /dev/null 2>&1 || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -108,7 +108,7 @@ $RNDCCMD 10.53.0.2 reconfig > rndc.out.$n 2>&1 && ret=1
 grep "failed: permission denied" rndc.out.$n > /dev/null 2>&1 || ret=1
 sleep 1
 grep "managed-keys-directory './nope' is not writable" ns2/named.run > /dev/null 2>&1 || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -119,7 +119,7 @@ $RNDCCMD 10.53.0.2 reconfig > rndc.out.$n 2>&1 && ret=1
 grep "failed: permission denied" rndc.out.$n > /dev/null 2>&1 || ret=1
 sleep 1
 grep "new-zones-directory './nope' is not writable" ns2/named.run > /dev/null 2>&1 || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -129,7 +129,7 @@ copy_setports ns2/named1.conf.in ns2/named.conf
 $RNDCCMD 10.53.0.2 reconfig > rndc.out.$n 2>&1 || ret=1
 [ -s ns2/named.pid ] || ret=1
 kill_named ns2/named.pid || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -139,7 +139,7 @@ ret=0
 wait_for_named "exiting (due to fatal error)" ns2/named$n.run || ret=1
 grep "[^-]directory './nope' is not writable" ns2/named$n.run > /dev/null 2>&1 || ret=1
 kill_named ns2/named.pid && ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -149,7 +149,7 @@ ret=0
 wait_for_named "exiting (due to fatal error)" ns2/named$n.run || ret=1
 grep "managed-keys-directory './nope' is not writable" ns2/named$n.run > /dev/null 2>&1 || ret=1
 kill_named named.pid && ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -159,7 +159,7 @@ ret=0
 wait_for_named "exiting (due to fatal error)" ns2/named$n.run || ret=1
 grep "new-zones-directory './nope' is not writable" ns2/named$n.run > /dev/null 2>&1 || ret=1
 kill_named ns2/named.pid && ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -172,7 +172,7 @@ copy_setports ns2/named-alt7.conf.in "ns2/${SPEC_DIR}/named.conf"
 wait_for_named "running$" ns2/named$n.run || ret=1
 grep 'running as.*\\177\\033' ns2/named$n.run > /dev/null || ret=1
 kill_named ns2/named.pid || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -185,7 +185,7 @@ copy_setports ns2/named-alt7.conf.in "ns2/${SPEC_DIR}/named.conf"
 wait_for_named "running$" ns2/named$n.run || ret=1
 grep 'running as.*\\$\\;' ns2/named$n.run > /dev/null || ret=1
 kill_named ns2/named.pid || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
 n=$((n+1))
@@ -199,12 +199,12 @@ wait_for_named "running$" ns2/named$n.run || ret=1
 #grep "running as.*\.\.\.$" ns2/named$n.run > /dev/null || ret=1
 echo_i "skipped - the ellipsis is currently not printed"
 kill_named ns2/named.pid || ret=1
-if [ $ret != 0 ]; then echo_i "failed"; fi
+if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=$((status+ret))
 
-n=`expr $n + 1`
+n=$((n+1))
 echo_i "verifying that named switches UID ($n)"
-if [ "`id -u`" = 0 ] && [ ! "$CYGWIN" ]; then
+if [ "`id -u`" -eq 0 ] && [ ! "$CYGWIN" ]; then
     ret=0
     TEMP_NAMED_DIR=`mktemp -d`
     if [ -d "${TEMP_NAMED_DIR}" ]; then
@@ -216,14 +216,14 @@ if [ "`id -u`" = 0 ] && [ ! "$CYGWIN" ]; then
         [ -s "${TEMP_NAMED_DIR}/named9.pid" ] || ret=1
         grep "loading configuration: permission denied" "${TEMP_NAMED_DIR}/named9.run" > /dev/null && ret=1
         pid=`cat "${TEMP_NAMED_DIR}/named9.pid" 2>/dev/null`
-        test "${pid:+set}" = set && $KILL -15 "${pid}" >/dev/null 2>&1
+        [ "${pid:+set}" = "set" ] && $KILL -15 "${pid}" >/dev/null 2>&1
         mv "${TEMP_NAMED_DIR}" ns2/
     else
         echo_i "mktemp failed"
         ret=1
     fi
-    if [ $ret != 0 ]; then echo_i "failed"; fi
-    status=`expr $status + $ret`
+    if [ $ret -ne 0 ]; then echo_i "failed"; fi
+    status=$((status+ret))
 else
     echo_i "skipped, not running as root or running on Windows"
 fi