7 files changed, 120 insertions, 116 deletions
diff --git a/bin/tests/system/checkds/ns2/setup.sh b/bin/tests/system/checkds/ns2/setup.sh
index 57c7f0a..34cea08 100644
--- a/bin/tests/system/checkds/ns2/setup.sh
+++ b/bin/tests/system/checkds/ns2/setup.sh
@@ -17,18 +17,17 @@
 echo_i "ns2/setup.sh"
 
 for subdomain in dspublished reference missing-dspublished bad-dspublished \
-		 multiple-dspublished incomplete-dspublished bad2-dspublished \
-		 dswithdrawn missing-dswithdrawn bad-dswithdrawn \
-		 multiple-dswithdrawn incomplete-dswithdrawn bad2-dswithdrawn
-do
-	cp "../ns9/dsset-$subdomain.checkds$TP" .
+  multiple-dspublished incomplete-dspublished bad2-dspublished \
+  dswithdrawn missing-dswithdrawn bad-dswithdrawn \
+  multiple-dswithdrawn incomplete-dswithdrawn bad2-dswithdrawn; do
+  cp "../ns9/dsset-$subdomain.checkds$TP" .
 done
 
 zone="checkds"
 infile="checkds.db.infile"
 zonefile="checkds.db"
 
-CSK=$($KEYGEN -k default $zone 2> keygen.out.$zone)
-cat template.db.in "${CSK}.key" > "$infile"
-private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
-$SIGNER -S -g -z -x -s now-1h -e now+30d -o $zone -O full -f $zonefile $infile > signer.out.$zone 2>&1
+CSK=$($KEYGEN -k default $zone 2>keygen.out.$zone)
+cat template.db.in "${CSK}.key" >"$infile"
+private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
+$SIGNER -S -g -z -x -s now-1h -e now+30d -o $zone -O full -f $zonefile $infile >signer.out.$zone 2>&1
diff --git a/bin/tests/system/checkds/ns5/setup.sh b/bin/tests/system/checkds/ns5/setup.sh
index 79d7b71..9f569c7 100644
--- a/bin/tests/system/checkds/ns5/setup.sh
+++ b/bin/tests/system/checkds/ns5/setup.sh
@@ -20,7 +20,7 @@ zone="checkds"
 infile="checkds.db.infile"
 zonefile="checkds.db"
 
-CSK=$($KEYGEN -k default $zone 2> keygen.out.$zone)
-cat template.db.in "${CSK}.key" > "$infile"
-private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
-$SIGNER -S -g -z -x -s now-1h -e now+30d -o $zone -O full -f $zonefile $infile > signer.out.$zone 2>&1
+CSK=$($KEYGEN -k default $zone 2>keygen.out.$zone)
+cat template.db.in "${CSK}.key" >"$infile"
+private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
+$SIGNER -S -g -z -x -s now-1h -e now+30d -o $zone -O full -f $zonefile $infile >signer.out.$zone 2>&1
diff --git a/bin/tests/system/checkds/ns9/setup.sh b/bin/tests/system/checkds/ns9/setup.sh
index 0990fa3..5204afb 100644
--- a/bin/tests/system/checkds/ns9/setup.sh
+++ b/bin/tests/system/checkds/ns9/setup.sh
@@ -17,11 +17,11 @@
 echo_i "ns9/setup.sh"
 
 setup() {
-	zone="$1"
-	echo_i "setting up zone: $zone"
-	zonefile="${zone}.db"
-	infile="${zone}.db.infile"
-	echo "$zone" >> zones
+  zone="$1"
+  echo_i "setting up zone: $zone"
+  zonefile="${zone}.db"
+  infile="${zone}.db.infile"
+  echo "$zone" >>zones
 }
 
 # Short environment variable names for key states and times.
@@ -34,30 +34,28 @@ Y="now-1y"
 
 # DS Publication.
 for zn in dspublished reference missing-dspublished bad-dspublished \
-	  multiple-dspublished incomplete-dspublished bad2-dspublished
-do
-	setup "${zn}.checkds"
-	cp template.db.in "$zonefile"
-	keytimes="-P $T -P sync $T -A $T"
-	CSK=$($KEYGEN -k default $keytimes $zone 2> keygen.out.$zone)
-	$SETTIME -s -g $O -k $O $T -r $O $T -z $O $T -d $R $T "$CSK" > settime.out.$zone 2>&1
-	cat template.db.in "${CSK}.key" > "$infile"
-	private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
-	cp $infile $zonefile
-	$SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zone.1 2>&1
+  multiple-dspublished incomplete-dspublished bad2-dspublished; do
+  setup "${zn}.checkds"
+  cp template.db.in "$zonefile"
+  keytimes="-P $T -P sync $T -A $T"
+  CSK=$($KEYGEN -k default $keytimes $zone 2>keygen.out.$zone)
+  $SETTIME -s -g $O -k $O $T -r $O $T -z $O $T -d $R $T "$CSK" >settime.out.$zone 2>&1
+  cat template.db.in "${CSK}.key" >"$infile"
+  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
+  cp $infile $zonefile
+  $SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
 done
 
 # DS Withdrawal.
 for zn in dswithdrawn missing-dswithdrawn bad-dswithdrawn multiple-dswithdrawn \
-	  incomplete-dswithdrawn bad2-dswithdrawn
-do
-	setup "${zn}.checkds"
-	cp template.db.in "$zonefile"
-	keytimes="-P $Y -P sync $Y -A $Y"
-	CSK=$($KEYGEN -k default $keytimes $zone 2> keygen.out.$zone)
-	$SETTIME -s -g $H -k $O $T -r $O $T -z $O $T -d $U $T "$CSK" > settime.out.$zone 2>&1
-	cat template.db.in "${CSK}.key" > "$infile"
-	private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >> "$infile"
-	cp $infile $zonefile
-	$SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile > signer.out.$zone.1 2>&1
+  incomplete-dswithdrawn bad2-dswithdrawn; do
+  setup "${zn}.checkds"
+  cp template.db.in "$zonefile"
+  keytimes="-P $Y -P sync $Y -A $Y"
+  CSK=$($KEYGEN -k default $keytimes $zone 2>keygen.out.$zone)
+  $SETTIME -s -g $H -k $O $T -r $O $T -z $O $T -d $U $T "$CSK" >settime.out.$zone 2>&1
+  cat template.db.in "${CSK}.key" >"$infile"
+  private_type_record $zone $DEFAULT_ALGORITHM_NUMBER "$CSK" >>"$infile"
+  cp $infile $zonefile
+  $SIGNER -S -z -x -s now-1h -e now+30d -o $zone -O raw -f "${zonefile}.signed" $infile >signer.out.$zone.1 2>&1
 done
diff --git a/bin/tests/system/checkds/prereq.sh b/bin/tests/system/checkds/prereq.sh
index 2204695..da5c078 100644
--- a/bin/tests/system/checkds/prereq.sh
+++ b/bin/tests/system/checkds/prereq.sh
@@ -14,18 +14,16 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-if test -n "$PYTHON"
-then
-    if [ "$($PYTHON -c "import dns.version; print(dns.version.MAJOR)" 2> /dev/null)" -ge 2 ]
-    then
-        :
-    else
-        echo_i "This test requires the dnspython >= 2.0.0 module." >&2
-        exit 1
-    fi
-else
-    echo_i "This test requires Python and the dnspython module." >&2
+if test -n "$PYTHON"; then
+  if [ "$($PYTHON -c "import dns.version; print(dns.version.MAJOR)" 2>/dev/null)" -ge 2 ]; then
+    :
+  else
+    echo_i "This test requires the dnspython >= 2.0.0 module." >&2
     exit 1
+  fi
+else
+  echo_i "This test requires Python and the dnspython module." >&2
+  exit 1
 fi
 
 exit 0
diff --git a/bin/tests/system/checkds/setup.sh b/bin/tests/system/checkds/setup.sh
index 93c73b6..38af810 100644
--- a/bin/tests/system/checkds/setup.sh
+++ b/bin/tests/system/checkds/setup.sh
@@ -27,14 +27,14 @@ copy_setports ns9/named.conf.in ns9/named.conf
 
 # Setup zones
 (
-	cd ns9
-	$SHELL setup.sh
+  cd ns9
+  $SHELL setup.sh
 )
 (
-	cd ns5
-	$SHELL setup.sh
+  cd ns5
+  $SHELL setup.sh
 )
 (
-	cd ns2
-	$SHELL setup.sh
+  cd ns2
+  $SHELL setup.sh
 )
diff --git a/bin/tests/system/checkdstool/dig.sh b/bin/tests/system/checkdstool/dig.sh
index 7b3a1b2..36be9cf 100755
--- a/bin/tests/system/checkdstool/dig.sh
+++ b/bin/tests/system/checkdstool/dig.sh
@@ -12,13 +12,22 @@
 # information regarding copyright ownership.
 
 while [ "$#" != 0 ]; do
-    case $1 in
+  case $1 in
     +*) shift ;;
     -t) shift ;;
-    DS|ds) ext=ds ; shift ;;
-    DNSKEY|dnskey) ext=dnskey ; shift ;;
-    *) file=$1 ; shift ;;
-    esac
+    DS | ds)
+      ext=ds
+      shift
+      ;;
+    DNSKEY | dnskey)
+      ext=dnskey
+      shift
+      ;;
+    *)
+      file=$1
+      shift
+      ;;
+  esac
 done
 
 cat ${file}.${ext}.db
diff --git a/bin/tests/system/checkdstool/tests.sh b/bin/tests/system/checkdstool/tests.sh
index 4248b11..15034aa 100644
--- a/bin/tests/system/checkdstool/tests.sh
+++ b/bin/tests/system/checkdstool/tests.sh
@@ -15,12 +15,12 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 if [ "$CYGWIN" ]; then
-    DIG=".\dig.bat"
-    WINDSFROMKEY=`cygpath -w $DSFROMKEY`
-    CHECKDS="$CHECKDS -a sha1 -a sha256 -d $DIG -D $WINDSFROMKEY"
+  DIG=".\dig.bat"
+  WINDSFROMKEY=$(cygpath -w $DSFROMKEY)
+  CHECKDS="$CHECKDS -a sha1 -a sha256 -d $DIG -D $WINDSFROMKEY"
 else
-    DIG="./dig.sh"
-    CHECKDS="$CHECKDS -a sha1 -a sha256 -d $DIG -D $DSFROMKEY"
+  DIG="./dig.sh"
+  CHECKDS="$CHECKDS -a sha1 -a sha256 -d $DIG -D $DSFROMKEY"
 fi
 chmod +x $DIG
 
@@ -29,88 +29,88 @@ n=1
 
 echo_i "checking for correct DS, looking up key via 'dig' ($n)"
 ret=0
-$CHECKDS ok.example > checkds.out.$n 2>&1 || ret=1
-grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS ok.example >checkds.out.$n 2>&1 || ret=1
+grep 'SHA-1' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for correct DS, obtaining key from file ($n)"
 ret=0
-$CHECKDS -f ok.example.dnskey.db ok.example > checkds.out.$n 2>&1 || ret=1
-grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS -f ok.example.dnskey.db ok.example >checkds.out.$n 2>&1 || ret=1
+grep 'SHA-1' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for incorrect DS, looking up key via 'dig' ($n)"
 ret=0
-$CHECKDS wrong.example > checkds.out.$n 2>&1 || ret=1
-grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS wrong.example >checkds.out.$n 2>&1 || ret=1
+grep 'SHA-1' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for incorrect DS, obtaining key from file ($n)"
 ret=0
-$CHECKDS -f wrong.example.dnskey.db wrong.example > checkds.out.$n 2>&1 || ret=1
-grep 'SHA-1' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS -f wrong.example.dnskey.db wrong.example >checkds.out.$n 2>&1 || ret=1
+grep 'SHA-1' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for partially missing DS, looking up key via 'dig' ($n)"
 ret=0
-$CHECKDS missing.example > checkds.out.$n 2>&1 && ret=1
-grep 'SHA-1.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-1.*missing' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256.*missing' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS missing.example >checkds.out.$n 2>&1 && ret=1
+grep 'SHA-1.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-1.*missing' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256.*missing' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for partially missing DS, obtaining key from file ($n)"
 ret=0
-$CHECKDS -f missing.example.dnskey.db missing.example > checkds.out.$n 2>&1 && ret=1
-grep 'SHA-1.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-1.*missing' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256.*missing' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS -f missing.example.dnskey.db missing.example >checkds.out.$n 2>&1 && ret=1
+grep 'SHA-1.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-1.*missing' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256.*missing' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for entirely missing DS, looking up key via 'dig' ($n)"
 ret=0
-$CHECKDS none.example > checkds.out.$n 2>&1 && ret=1
-grep 'SHA-1.*found' checkds.out.$n > /dev/null 2>&1 && ret=1
-grep 'SHA-256.*found' checkds.out.$n > /dev/null 2>&1 && ret=1
-n=`expr $n + 1`
+$CHECKDS none.example >checkds.out.$n 2>&1 && ret=1
+grep 'SHA-1.*found' checkds.out.$n >/dev/null 2>&1 && ret=1
+grep 'SHA-256.*found' checkds.out.$n >/dev/null 2>&1 && ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking for entirely missing DS, obtaining key from file ($n)"
 ret=0
-$CHECKDS -f none.example.dnskey.db none.example > checkds.out.$n 2>&1 && ret=1
-grep 'SHA-1.*found' checkds.out.$n > /dev/null 2>&1 && ret=1
-grep 'SHA-256.*found' checkds.out.$n > /dev/null 2>&1 && ret=1
-n=`expr $n + 1`
+$CHECKDS -f none.example.dnskey.db none.example >checkds.out.$n 2>&1 && ret=1
+grep 'SHA-1.*found' checkds.out.$n >/dev/null 2>&1 && ret=1
+grep 'SHA-256.*found' checkds.out.$n >/dev/null 2>&1 && ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 echo_i "checking with prepared dsset file ($n)"
 ret=0
-$CHECKDS -f prep.example.db -s prep.example.ds.db prep.example > checkds.out.$n 2>&1 || ret=1
-grep 'SHA-1.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-grep 'SHA-256.*found' checkds.out.$n > /dev/null 2>&1 || ret=1
-n=`expr $n + 1`
+$CHECKDS -f prep.example.db -s prep.example.ds.db prep.example >checkds.out.$n 2>&1 || ret=1
+grep 'SHA-1.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+grep 'SHA-256.*found' checkds.out.$n >/dev/null 2>&1 || ret=1
+n=$(expr $n + 1)
 if [ $ret != 0 ]; then echo_i "failed"; fi
-status=`expr $status + $ret`
+status=$(expr $status + $ret)
 
 if [ $status = 0 ]; then $SHELL clean.sh; fi
 echo_i "exit status: $status"