[rt42931] Lots of tests fixed, use of trailing period variable

diff --git a/bin/tests/system/autosign/ns1/keygen.sh b/bin/tests/system/autosign/ns1/keygen.sh
index fbc6feab74a7889d83e621a6ddd4683a3b7f555a..124cdc18c4736976a0f3fc7db7def92b21b9e48c 100644 (file)
--- a/bin/tests/system/autosign/ns1/keygen.sh
+++ b/bin/tests/system/autosign/ns1/keygen.sh
@@ -15,7 +15,7 @@ infile=root.db.in
 
 (cd ../ns2 && $SHELL keygen.sh )
 
-cat $infile ../ns2/dsset-example. > $zonefile
+cat $infile ../ns2/dsset-example$TP > $zonefile
 
 zskact=`$KEYGEN -3 -q -r $RANDFILE $zone`
 zskvanish=`$KEYGEN -3 -q -r $RANDFILE $zone`

diff --git a/bin/tests/system/autosign/ns2/keygen.sh b/bin/tests/system/autosign/ns2/keygen.sh
index a120f22ca1df5e9e1a9c5b68c4bfe300979ee61f..5acb99a3153b86c3dc38da2f78a7b16a1e6ac81e 100644 (file)
--- a/bin/tests/system/autosign/ns2/keygen.sh
+++ b/bin/tests/system/autosign/ns2/keygen.sh
@@ -14,18 +14,18 @@ SYSTEMTESTTOP=../..
 
 for subdomain in secure nsec3 autonsec3 optout rsasha256 rsasha512 nsec3-to-nsec oldsigs sync
 do
-       cp ../ns3/dsset-$subdomain.example. .
+       cp ../ns3/dsset-$subdomain.example$TP .
 done
 
 # Create keys and pass the DS to the parent.
 zone=example
 zonefile="${zone}.db"
 infile="${zonefile}.in"
-cat $infile dsset-*.example. > $zonefile
+cat $infile dsset-*.example$TP > $zonefile
 
 kskname=`$KEYGEN -3 -q -r $RANDFILE -fk $zone`
 $KEYGEN -3 -q -r $RANDFILE $zone > /dev/null
-$DSFROMKEY $kskname.key > dsset-${zone}.
+$DSFROMKEY $kskname.key > dsset-${zone}$TP
 
 # Create keys for a private secure zone.
 zone=private.secure.example
@@ -46,4 +46,4 @@ do
        cp $i `echo $i | sed s/X/K/`
 done
 $KEYGEN -q -r $RANDFILE $zone > /dev/null
-$DSFROMKEY Kbar.+005+30804.key > dsset-bar.
+$DSFROMKEY Kbar.+005+30804.key > dsset-bar$TP

diff --git a/bin/tests/system/autosign/ns3/keygen.sh b/bin/tests/system/autosign/ns3/keygen.sh
index fa9c91da50f287a972401fc7631e8dfc013777a2..40dfebc6f6e8b0f37e8bf4302d558e323069022b 100644 (file)
--- a/bin/tests/system/autosign/ns3/keygen.sh
+++ b/bin/tests/system/autosign/ns3/keygen.sh
@@ -29,7 +29,7 @@ setup secure.example
 cp $infile $zonefile
 ksk=`$KEYGEN -3 -q -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -3 -q -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  NSEC3/NSEC test zone
@@ -38,7 +38,7 @@ setup secure.nsec3.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  NSEC3/NSEC3 test zone
@@ -47,7 +47,7 @@ setup nsec3.nsec3.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  OPTOUT/NSEC3 test zone
@@ -56,16 +56,16 @@ setup optout.nsec3.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # A nsec3 zone (non-optout).
 #
 setup nsec3.example
-cat $infile dsset-*.${zone}. > $zonefile
+cat $infile dsset-*.${zone}$TP > $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # An NSEC3 zone, with NSEC3 parameters set prior to signing
@@ -76,7 +76,7 @@ ksk=`$KEYGEN -G -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 echo $ksk > ../autoksk.key
 zsk=`$KEYGEN -G -q -3 -r $RANDFILE $zone 2> kg.out` || dumpit kg.out
 echo $zsk > ../autozsk.key
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  OPTOUT/NSEC test zone
@@ -85,7 +85,7 @@ setup secure.optout.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  OPTOUT/NSEC3 test zone
@@ -94,7 +94,7 @@ setup nsec3.optout.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 #  OPTOUT/OPTOUT test zone
@@ -103,16 +103,16 @@ setup optout.optout.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # A optout nsec3 zone.
 #
 setup optout.example
-cat $infile dsset-*.${zone}. > $zonefile
+cat $infile dsset-*.${zone}$TP > $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -3 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # A RSASHA256 zone.
@@ -121,7 +121,7 @@ setup rsasha256.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -a RSASHA256 -b 2048 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -a RSASHA256 -b 1024 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # A RSASHA512 zone.
@@ -130,7 +130,7 @@ setup rsasha512.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -a RSASHA512 -b 2048 -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -a RSASHA512 -b 1024 -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # NSEC-only zone.
@@ -139,7 +139,7 @@ setup nsec.example
 cp $infile $zonefile
 ksk=`$KEYGEN -q -r $RANDFILE -fk $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -q -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 
 #
 # Signature refresh test zone.  Signatures are set to expire long
@@ -213,7 +213,7 @@ cp $infile $zonefile
 # existing DNSKEY RRset, should retain TTL
 setup ttl4.example
 $KEYGEN -3 -q -r $RANDFILE -L 30 -fk $zone > kg.out 2>&1 || dumpit kg.out
-cat ${infile} K${zone}.+*.key > $zonefile
+cat ${infile} K${zone}$TP+*.key > $zonefile
 $KEYGEN -3 -q -r $RANDFILE -L 180 $zone > kg.out 2>&1 || dumpit kg.out
 
 #
@@ -262,5 +262,5 @@ setup sync.example
 cp $infile $zonefile
 ksk=`$KEYGEN -3 -q -r $RANDFILE -fk -P sync now $zone 2> kg.out` || dumpit kg.out
 $KEYGEN -3 -q -r $RANDFILE $zone > kg.out 2>&1 || dumpit kg.out
-$DSFROMKEY $ksk.key > dsset-${zone}.
+$DSFROMKEY $ksk.key > dsset-${zone}$TP
 echo ns3/$ksk > ../sync.key

diff --git a/bin/tests/system/conf.sh.in b/bin/tests/system/conf.sh.in
index 18062635289572dd657eeec9f21c5eeaa6030ec9..74fe872579044712c9d54b87334cc1a731ff7e9c 100644 (file)
--- a/bin/tests/system/conf.sh.in
+++ b/bin/tests/system/conf.sh.in
@@ -57,6 +57,9 @@ FSTRM_CAPTURE=@FSTRM_CAPTURE@
 
 RANDFILE=$TOP/bin/tests/system/random.data
 
+# There's no trailing period on Windows
+TP=.
+
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth

diff --git a/bin/tests/system/conf.sh.win.in b/bin/tests/system/conf.sh.win.in
index c61b5eac02f01d11b0835a4362becdc80544e605..7dfbe27abf7aaa999f6cbfbef95c7f6e1af381fe 100644 (file)
--- a/bin/tests/system/conf.sh.win.in
+++ b/bin/tests/system/conf.sh.win.in
@@ -57,6 +57,9 @@ FSTRM_CAPTURE=@FSTRM_CAPTURE@
 
 RANDFILE=$TOP/bin/tests/system/random.data
 
+# No trailing period on Windows
+TP=
+
 # The "stress" test is not run by default since it creates enough
 # load on the machine to make it unusable to other users.
 # v6synth
@@ -73,17 +76,13 @@ SUBDIRS="acl additional addzone allow_query autosign builtin cacheclean case
         tkey tsig tsiggss unknown upforwd verify views wildcard xfer
         xferquota zero zonechecks"
 
-# Use the CONFIG_SHELL detected by configure for tests
-SHELL=@SHELL@
-
-# CURL will be empty if no program was found by configure
+# Configure is launched from native environment, but tests are run in Cygwin -
+# so any detection is unreliable. 
+SHELL="/bin/bash -o igncr"
 CURL=@CURL@
-
-# XMLLINT will be empty if no program was found by configure
 XMLLINT=@XMLLINT@
+PERL=/usr/bin/perl
 
-# PERL will be an empty string if no perl interpreter was found.
-PERL=@PERL@
 if test -n "$PERL"
 then
        if $PERL -e "use IO::Socket::INET6;" 2> /dev/null

diff --git a/bin/tests/system/dlv/ns3/sign.sh b/bin/tests/system/dlv/ns3/sign.sh
index 28506a77d9c57d81a60059d4cb57caa6cc03f1e7..ea7b73f63d42c1ada7e86b9ea9663f0fa3053da4 100755 (executable)
--- a/bin/tests/system/dlv/ns3/sign.sh
+++ b/bin/tests/system/dlv/ns3/sign.sh
@@ -21,12 +21,13 @@ zone=child1.utld.
 infile=child.db.in
 zonefile=child1.utld.db
 outfile=child1.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null` 
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -36,12 +37,13 @@ zone=child3.utld.
 infile=child.db.in
 zonefile=child3.utld.db
 outfile=child3.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -51,7 +53,7 @@ zone=child4.utld.
 infile=child.db.in
 zonefile=child4.utld.db
 outfile=child4.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
@@ -66,12 +68,13 @@ zone=child5.utld.
 infile=child.db.in
 zonefile=child5.utld.db
 outfile=child5.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -85,7 +88,8 @@ outfile=child7.signed
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -109,7 +113,7 @@ zone=child9.utld.
 infile=child.db.in
 zonefile=child9.utld.db
 outfile=child9.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
@@ -123,7 +127,7 @@ zone=child10.utld.
 infile=child.db.in
 zonefile=child10.utld.db
 outfile=child10.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
@@ -137,13 +141,14 @@ zone=child1.druz.
 infile=child.db.in
 zonefile=child1.druz.db
 outfile=child1.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
-dssets="$dssets dsset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null` 
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -153,13 +158,14 @@ zone=child3.druz.
 infile=child.db.in
 zonefile=child3.druz.db
 outfile=child3.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
-dssets="$dssets dsset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -169,8 +175,8 @@ zone=child4.druz.
 infile=child.db.in
 zonefile=child4.druz.db
 outfile=child4.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
-dssets="$dssets dsset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
@@ -185,13 +191,14 @@ zone=child5.druz.
 infile=child.db.in
 zonefile=child5.druz.db
 outfile=child5.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
-dssets="$dssets dsset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -l $dlvzone -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -201,12 +208,13 @@ zone=child7.druz.
 infile=child.db.in
 zonefile=child7.druz.db
 outfile=child7.druz.signed
-dssets="$dssets dsset-$zone"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 
-cat $infile $keyname1.key $keyname2.key ../ns6/dsset-grand.$zone >$zonefile
+dsfilename=../ns6/dsset-grand.`echo $zone |sed -e "s/\.$//g"`$TP
+cat $infile $keyname1.key $keyname2.key $dsfilename >$zonefile
 
 $SIGNER -r $RANDFILE -o $zone -f $outfile $zonefile > /dev/null 2> signer.err || cat signer.err
 echo "I: signed $zone"
@@ -230,7 +238,7 @@ zone=child9.druz.
 infile=child.db.in
 zonefile=child9.druz.db
 outfile=child9.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
@@ -244,8 +252,8 @@ zone=child10.druz.
 infile=child.db.in
 zonefile=child10.druz.db
 outfile=child10.druz.signed
-dlvsets="$dlvsets dlvset-$zone"
-dssets="$dssets dsset-$zone"
+dlvsets="$dlvsets dlvset-`echo $zone |sed -e "s/.$//g"`$TP"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a DSA -b 768 -n zone $zone 2> /dev/null`

diff --git a/bin/tests/system/dnssec/ns1/sign.sh b/bin/tests/system/dnssec/ns1/sign.sh
index 0b84ef7b15d27f249fce2fbaa953077739e1a710..514924b37cc916f1ab1bdec95e53c89853259892 100644 (file)
--- a/bin/tests/system/dnssec/ns1/sign.sh
+++ b/bin/tests/system/dnssec/ns1/sign.sh
@@ -17,12 +17,12 @@ zonefile=root.db
 (cd ../ns6 && $SHELL sign.sh )
 (cd ../ns7 && $SHELL sign.sh )
 
-cp ../ns2/dsset-example. .
-cp ../ns2/dsset-dlv. .
-cp ../ns2/dsset-in-addr.arpa. .
+cp ../ns2/dsset-example$TP .
+cp ../ns2/dsset-dlv$TP .
+cp ../ns2/dsset-in-addr.arpa$TP .
 
-grep "8 [12] " ../ns2/dsset-algroll. > dsset-algroll.
-cp ../ns6/dsset-optout-tld. .
+grep "8 [12] " ../ns2/dsset-algroll$TP > dsset-algroll$TP
+cp ../ns6/dsset-optout-tld$TP .
 
 keyname=`$KEYGEN -q -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone`
 

diff --git a/bin/tests/system/dnssec/ns2/sign.sh b/bin/tests/system/dnssec/ns2/sign.sh
index 10d2150bde5a7b77c59b118cebf2f107ae5b1614..be711ca579148b4f6f08acb57e32a9c8d419a9fa 100644 (file)
--- a/bin/tests/system/dnssec/ns2/sign.sh
+++ b/bin/tests/system/dnssec/ns2/sign.sh
@@ -23,7 +23,7 @@ for subdomain in secure badds bogus dynamic keyless nsec3 optout \
        ttlpatch split-dnssec split-smart expired expiring upper lower \
        dnskey-unknown dnskey-nsec3-unknown managed-future revkey
 do
-       cp ../ns3/dsset-$subdomain.example. .
+       cp ../ns3/dsset-$subdomain.example$TP .
 done
 
 keyname1=`$KEYGEN -q -r $RANDFILE -a DSA -b 768 -n zone $zone`
@@ -110,10 +110,11 @@ $SIGNER -P -g -r $RANDFILE -o $privzone -l dlv $privzonefile > /dev/null
 dlvzone=dlv.
 dlvinfile=dlv.db.in
 dlvzonefile=dlv.db
+dlvsetfile=dlvset-`echo $privzone |sed -e "s/\.$//g"`$TP
 
 dlvkeyname=`$KEYGEN -q -r $RANDFILE -a RSAMD5 -b 768 -n zone $dlvzone`
 
-cat $dlvinfile $dlvkeyname.key dlvset-$privzone > $dlvzonefile
+cat $dlvinfile $dlvkeyname.key $dlvsetfile > $dlvzonefile
 
 $SIGNER -P -g -r $RANDFILE -o $dlvzone $dlvzonefile > /dev/null
 

diff --git a/bin/tests/system/dnssec/ns3/sign.sh b/bin/tests/system/dnssec/ns3/sign.sh
index 87aa7a5c20f8806da6315e62d1e6805605907a8b..43aad4e0cab7280f1777496904522b3bf93ac039 100644 (file)
--- a/bin/tests/system/dnssec/ns3/sign.sh
+++ b/bin/tests/system/dnssec/ns3/sign.sh
@@ -205,7 +205,8 @@ $SIGNER -P -3 - -r $RANDFILE -o $zone -O full -f ${zonefile}.tmp $zonefile > /de
 
 awk '$4 == "DNSKEY" { $7 = 100; print } $4 == "RRSIG" { $6 = 100; print } { print }' ${zonefile}.tmp > ${zonefile}.signed
 
-$DSFROMKEY -A -f ${zonefile}.signed $zone > dsset-${zone}
+DSFILE=dsset-`echo ${zone} |sed -e "s/\.$//g"`$TP
+$DSFROMKEY -A -f ${zonefile}.signed $zone > $DSFILE
 
 #
 # A zone with a unknown DNSKEY algorithm + unknown NSEC3 hash algorithm (-U).
@@ -223,7 +224,8 @@ $SIGNER -P -3 - -r $RANDFILE -o $zone -U -O full -f ${zonefile}.tmp $zonefile >
 
 awk '$4 == "DNSKEY" { $7 = 100; print } $4 == "RRSIG" { $6 = 100; print } { print }' ${zonefile}.tmp > ${zonefile}.signed
 
-$DSFROMKEY -A -f ${zonefile}.signed $zone > dsset-${zone}
+DSFILE=dsset-`echo ${zone} |sed -e "s/\.$//g"`$TP
+$DSFROMKEY -A -f ${zonefile}.signed $zone > $DSFILE
 
 #
 # A multiple parameter nsec3 zone.
@@ -498,7 +500,7 @@ keyname=`$KEYGEN -q -r $RANDFILE -a RSAMD5 -b 768 -n zone $zone`
 cat $infile $keyname.key >$zonefile
 
 $SIGNER -P -r $RANDFILE -o $zone $zonefile > /dev/null 2>&1
-sed -e 's/bogus/badds/g' < dsset-bogus.example. > dsset-badds.example.
+sed -e 's/bogus/badds/g' < dsset-bogus.example$TP > dsset-badds.example$TP
 
 #
 # A zone with future signatures.

diff --git a/bin/tests/system/dnssec/tests.sh b/bin/tests/system/dnssec/tests.sh
index 90080e9b8e7f18dd8930f1b3f691664fbe1439d9..08dc4626f48c92e713ab3e6f598e610582350d43 100644 (file)
--- a/bin/tests/system/dnssec/tests.sh
+++ b/bin/tests/system/dnssec/tests.sh
@@ -2526,7 +2526,7 @@ awk '{
        for (i=1;i<7;i++) printf("%s ", $i);
        for (i=7;i<=NF;i++) printf("%s", $i);
        printf("\n");
-}' < ns1/dsset-algroll. > canonical2.$n || ret=1
+}' < ns1/dsset-algroll$TP > canonical2.$n || ret=1
 diff -b canonical1.$n canonical2.$n > /dev/null 2>&1 || ret=1
 n=`expr $n + 1`
 if [ $ret != 0 ]; then echo "I:failed"; fi

diff --git a/bin/tests/system/dsdigest/ns1/sign.sh b/bin/tests/system/dsdigest/ns1/sign.sh
index 1408bd7b37c3c27a4208d71208295a0c0a841b18..3a768b1f9f59a3ae8e0a3a27f785b67d9f555380 100644 (file)
--- a/bin/tests/system/dsdigest/ns1/sign.sh
+++ b/bin/tests/system/dsdigest/ns1/sign.sh
@@ -15,8 +15,8 @@ zonefile=root.db
 
 (cd ../ns2 && $SHELL sign.sh)
 
-cp ../ns2/dsset-good. .
-cp ../ns2/dsset-bad. .
+cp ../ns2/dsset-good$TP .
+cp ../ns2/dsset-bad$TP .
 
 key1=`$KEYGEN -q -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone`
 key2=`$KEYGEN -q -r $RANDFILE -a RSASHA1 -b 2048 -n zone -f KSK $zone`

diff --git a/bin/tests/system/dsdigest/ns2/sign.sh b/bin/tests/system/dsdigest/ns2/sign.sh
index bae3f1046483af3ae7e0464c5cd226cc06093ffc..2b26b9ef1cf23cd3488b060b578d727cbe4ee8ea 100644 (file)
--- a/bin/tests/system/dsdigest/ns2/sign.sh
+++ b/bin/tests/system/dsdigest/ns2/sign.sh
@@ -29,8 +29,10 @@ cat $infile2 $keyname21.key $keyname22.key >$zonefile2
 $SIGNER -P -g -r $RANDFILE -o $zone1 $zonefile1 > /dev/null
 $SIGNER -P -g -r $RANDFILE -o $zone2 $zonefile2 > /dev/null
 
-$DSFROMKEY -a SHA-256 $keyname12 > dsset-$zone1
-$DSFROMKEY -a SHA-256 $keyname22 > dsset-$zone2
+DSFILENAME1=dsset-`echo $zone1 |sed -e "s/\.$//g"`$TP
+DSFILENAME2=dsset-`echo $zone2 |sed -e "s/\.$//g"`$TP
+$DSFROMKEY -a SHA-256 $keyname12 > $DSFILENAME1
+$DSFROMKEY -a SHA-256 $keyname22 > $DSFILENAME2
 
 supported=`cat ../supported`
 case "$supported" in
@@ -38,5 +40,6 @@ case "$supported" in
     *) algo=SHA-384 ;;
 esac
 
-$DSFROMKEY -a $algo $keyname12 >> dsset-$zone1
-$DSFROMKEY -a $algo $keyname22 > dsset-$zone2
+$DSFROMKEY -a $algo $keyname12 >> $DSFILENAME1
+$DSFROMKEY -a $algo $keyname22 > $DSFILENAME2
+

diff --git a/bin/tests/system/metadata/tests.sh b/bin/tests/system/metadata/tests.sh
index 4bcbede4c906cd5663b8f2eebb42c93d14423f8b..e5b2109686fc40aeb0905481163f304b309112c7 100644 (file)
--- a/bin/tests/system/metadata/tests.sh
+++ b/bin/tests/system/metadata/tests.sh
@@ -137,18 +137,22 @@ 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
-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
-n=`expr $n + 1`
-if [ $ret != 0 ]; then echo "I:failed"; fi
-status=`expr $status + $ret`
+if [ `uname -o` == Cygwin ]; 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
+       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

diff --git a/bin/tests/system/pending/ns1/sign.sh b/bin/tests/system/pending/ns1/sign.sh
index 0d093529194b1439e1c0cbff9eb26b48e1dd024c..a5d9a4901bdd20b8e5a32621ad91a622b6c424f6 100644 (file)
--- a/bin/tests/system/pending/ns1/sign.sh
+++ b/bin/tests/system/pending/ns1/sign.sh
@@ -15,8 +15,8 @@ zonefile=root.db
 
 (cd ../ns2 && $SHELL -e sign.sh )
 
-cp ../ns2/dsset-example. .
-cp ../ns2/dsset-example.com. .
+cp ../ns2/dsset-example$TP .
+cp ../ns2/dsset-example.com$TP .
 
 keyname1=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $zone`
 keyname2=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 2048 -f KSK -n zone $zone`

diff --git a/bin/tests/system/resolver/clean.sh b/bin/tests/system/resolver/clean.sh
index c710f72aef585dfb020ce99b30d712d4761be900..3cc7621d8e75f5948badf8542dbb6048045454e5 100644 (file)
--- a/bin/tests/system/resolver/clean.sh
+++ b/bin/tests/system/resolver/clean.sh
@@ -22,8 +22,8 @@ rm -f ns4/tld.db
 rm -f ns6/K*
 rm -f ns6/example.net.db.signed ns6/example.net.db
 rm -f ns6/ds.example.net.db.signed ns6/ds.example.net.db
-rm -f ns6/dsset-ds.example.net.
-rm -f ns6/dsset-example.net. ns6/example.net.db.signed.jnl
+rm -f ns6/dsset-ds.example.net*
+rm -f ns6/dsset-example.net* ns6/example.net.db.signed.jnl
 rm -f ns6/to-be-removed.tld.db ns6/to-be-removed.tld.db.jnl
 rm -f ns7/server.db ns7/server.db.jnl ns7/named.conf
 rm -f resolve.out

diff --git a/bin/tests/system/resolver/ns6/keygen.sh b/bin/tests/system/resolver/ns6/keygen.sh
index c1193d584f23dcf6136a95b336ed5434c268b7b0..bfdee21f07e70ea70e3cf9a3f04650128eedbec0 100644 (file)
--- a/bin/tests/system/resolver/ns6/keygen.sh
+++ b/bin/tests/system/resolver/ns6/keygen.sh
@@ -26,7 +26,7 @@ infile="${zonefile}.in"
 cp $infile $zonefile
 ksk=`$KEYGEN -q -3 -r $RANDFILE -fk $zone`
 zsk=`$KEYGEN -q -3 -r $RANDFILE $zone`
-cat $ksk.key $zsk.key dsset-ds.example.net. >> $zonefile
+cat $ksk.key $zsk.key dsset-ds.example.net$TP >> $zonefile
 $SIGNER -P -r $RANDFILE -o $zone $zonefile > /dev/null 2>&1
 
 # Configure a trusted key statement (used by delve)

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 45c247cac1cb99bda070a8d37d7751bfba7a531e..e0e0e4a6a2fa02833c7f9d7b8783c9f81852f94c 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -34,7 +34,8 @@ signzone () {
     cat $1/$3 $1/$KEYNAME.key > $1/tmp
     $SIGNER -Pp -K $1 -o $2 -f $1/$4 $1/tmp >/dev/null
     sed -n -e 's/\(.*\) IN DNSKEY \([0-9]\{1,\} [0-9]\{1,\} [0-9]\{1,\}\) \(.*\)/trusted-keys {"\1" \2 "\3";};/p' $1/$KEYNAME.key >>trusted.conf
-    rm dsset-$2 $1/tmp
+    DSFILENAME=dsset-`echo $2 |sed -e "s/\.$//g"`$TP
+    rm $DSFILENAME $1/tmp
 }
 signzone ns2 tld2s. base-tld2s.db tld2s.db
 

diff --git a/bin/tests/system/rrchecker/tests.sh b/bin/tests/system/rrchecker/tests.sh
index b10f469b0bcffcaa111da278685d37b6f3a97daa..452f128077d0b2b5d884451bb1e36e3b7f8e7484 100644 (file)
--- a/bin/tests/system/rrchecker/tests.sh
+++ b/bin/tests/system/rrchecker/tests.sh
@@ -14,15 +14,15 @@ t=0
 
 echo "I:class list"
 $RRCHECKER -C > classlist.out
-diff classlist.out classlist.good || { echo "I:failed"; status=`expr $status + 1`; }
+$DIFF classlist.out classlist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
 echo "I:type list"
 $RRCHECKER -T > typelist.out
-diff typelist.out typelist.good || { echo "I:failed"; status=`expr $status + 1`; }
+$DIFF typelist.out typelist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
 echo "I:private type list"
 $RRCHECKER -P > privatelist.out
-diff privatelist.out privatelist.good || { echo "I:failed"; status=`expr $status + 1`; }
+$DIFF privatelist.out privatelist.good || { echo "I:failed"; status=`expr $status + 1`; }
 
 myecho() {
 cat << EOF

diff --git a/bin/tests/system/rrsetorder/tests.sh b/bin/tests/system/rrsetorder/tests.sh
index cd735dd3aa228ce3266cac468e97574a9a184ca9..b2b5db3a8d9bfc8f1deded383032bd64dd135a55 100644 (file)
--- a/bin/tests/system/rrsetorder/tests.sh
+++ b/bin/tests/system/rrsetorder/tests.sh
@@ -30,7 +30,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIGCMD @10.53.0.1 fixed.example > dig.out.fixed || ret=1
-    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
+    $DIFF dig.out.fixed dig.out.fixed.good >/dev/null || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
@@ -45,15 +45,15 @@ else
         if [ $i -le 4 ]; then
             cp dig.out.fixed dig.out.$j
         else
-            cmp -s dig.out.fixed dig.out.$j && matches=`expr $matches + 1`
+            $DIFF dig.out.fixed dig.out.$j >/dev/null && matches=`expr $matches + 1`
         fi
     done
-    cmp -s dig.out.0 dig.out.1 && ret=1
-    cmp -s dig.out.0 dig.out.2 && ret=1
-    cmp -s dig.out.0 dig.out.3 && ret=1
-    cmp -s dig.out.1 dig.out.2 && ret=1
-    cmp -s dig.out.1 dig.out.3 && ret=1
-    cmp -s dig.out.2 dig.out.3 && ret=1
+    $DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+    $DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+    $DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+    $DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+    $DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+    $DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
     if [ $matches -ne 16 ]; then ret=1; fi
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
@@ -72,15 +72,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic dig.out.$j
     else
-        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -98,15 +98,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic2 dig.out.$j
     else
-        cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -122,7 +122,7 @@ do
        match=0
        for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
        do
-               eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
+               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
                if [ $match -eq 1 ]; then break; fi
        done
        if [ $match -eq 0 ]; then ret=1; fi
@@ -146,7 +146,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1
-    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
+    $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
@@ -165,15 +165,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic dig.out.$j
     else
-        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -191,15 +191,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic2 dig.out.$j
     else
-        cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -216,7 +216,7 @@ $DIGCMD @10.53.0.2 random.example > dig.out.random || ret=1
        match=0
        for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
        do
-               eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
+               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
                if [ $match -eq 1 ]; then break; fi
        done
        if [ $match -eq 0 ]; then ret=1; fi
@@ -256,7 +256,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIGCMD @10.53.0.2 fixed.example > dig.out.fixed || ret=1
-    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
+    $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
@@ -275,15 +275,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic dig.out.$j
     else
-        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -301,15 +301,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic2 dig.out.$j
     else
-        cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -326,7 +326,7 @@ do
        match=0
        for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
        do
-               eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
+               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
                if [ $match -eq 1 ]; then break; fi
        done
        if [ $match -eq 0 ]; then ret=1; fi
@@ -350,7 +350,7 @@ if $test_fixed; then
     for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
     do
     $DIGCMD @10.53.0.3 fixed.example > dig.out.fixed || ret=1
-    cmp -s dig.out.fixed dig.out.fixed.good || ret=1
+    $DIFF dig.out.fixed dig.out.fixed.good || ret=1
     done
     if [ $ret != 0 ]; then echo "I:failed"; fi
     status=`expr $status + $ret`
@@ -371,15 +371,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic dig.out.$j
     else
-        cmp -s dig.out.cyclic dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -399,15 +399,15 @@ do
     if [ $i -le 4 ]; then
         cp dig.out.cyclic2 dig.out.$j
     else
-        cmp -s dig.out.cyclic2 dig.out.$j && matches=`expr $matches + 1`
+        $DIFF dig.out.cyclic2 dig.out.$j >/dev/null && matches=`expr $matches + 1`
     fi
 done
-cmp -s dig.out.0 dig.out.1 && ret=1
-cmp -s dig.out.0 dig.out.2 && ret=1
-cmp -s dig.out.0 dig.out.3 && ret=1
-cmp -s dig.out.1 dig.out.2 && ret=1
-cmp -s dig.out.1 dig.out.3 && ret=1
-cmp -s dig.out.2 dig.out.3 && ret=1
+$DIFF dig.out.0 dig.out.1 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.0 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.2 >/dev/null && ret=1
+$DIFF dig.out.1 dig.out.3 >/dev/null && ret=1
+$DIFF dig.out.2 dig.out.3 >/dev/null && ret=1
 if [ $matches -ne 16 ]; then ret=1; fi
 if [ $ret != 0 ]; then echo "I:failed"; fi
 status=`expr $status + $ret`
@@ -424,7 +424,7 @@ do
        match=0
        for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
        do
-               eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
+               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
                if [ $match -eq 1 ]; then break; fi
        done
        if [ $match -eq 0 ]; then ret=1; fi
@@ -451,7 +451,7 @@ $DIG +nosea +nocomm +nocmd +noquest +noadd +noauth +nocomm +nostat +short \
        match=0
        for j in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
        do
-               eval "cmp -s dig.out.random dig.out.random.good$j && match$j=1 match=1"
+               eval "$DIFF dig.out.random dig.out.random.good$j >/dev/null && match$j=1 match=1"
                if [ $match -eq 1 ]; then break; fi
        done
        if [ $match -eq 0 ]; then ret=1; fi

diff --git a/bin/tests/system/sfcache/ns1/sign.sh b/bin/tests/system/sfcache/ns1/sign.sh
index 85a8cc2cb093dd01383f8df74d3c3fba2f87d88d..9e43e9b7fcd6b3d223f7f628dba950d8c9a4573b 100644 (file)
--- a/bin/tests/system/sfcache/ns1/sign.sh
+++ b/bin/tests/system/sfcache/ns1/sign.sh
@@ -15,7 +15,7 @@ zone=.
 infile=root.db.in
 zonefile=root.db
 
-(cd ../ns2 && sh sign.sh )
+(cd ../ns2 && $SHELL sign.sh )
 
 cp ../ns2/dsset-example. .
 

diff --git a/bin/tests/system/sfcache/prereq.sh b/bin/tests/system/sfcache/prereq.sh
index 321c3b63b2204052d6ca6782a719274c8667e524..7a0cae0697d427afeb0015cc057f49237357d0be 100644 (file)
--- a/bin/tests/system/sfcache/prereq.sh
+++ b/bin/tests/system/sfcache/prereq.sh
@@ -6,7 +6,10 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-../../../tools/genrandom 400 random.data
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
+
+$GENRANDOM 400 random.data
 
 if $KEYGEN -q -a RSAMD5 -b 512 -n zone -r random.data foo > /dev/null 2>&1
 then

diff --git a/bin/tests/system/sfcache/setup.sh b/bin/tests/system/sfcache/setup.sh
index 04e122cdd1e4cc6d5bbe06f39e628cc2bca347df..2d32b23447c385c237045ceccd34fb6f17b41653 100644 (file)
--- a/bin/tests/system/sfcache/setup.sh
+++ b/bin/tests/system/sfcache/setup.sh
@@ -6,9 +6,12 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-../../../tools/genrandom 400 random.data
+SYSTEMTESTTOP=..
+. $SYSTEMTESTTOP/conf.sh
 
-cd ns1 && sh sign.sh
+$GENRANDOM 400 random.data
+
+cd ns1 && $SHELL sign.sh
 
 cd ../ns5 && cp -f trusted.conf.bad trusted.conf
 

diff --git a/bin/tests/system/sortlist/tests.sh b/bin/tests/system/sortlist/tests.sh
index 2a393b33c7a36511d568e2dc1ea8099b6fc481bf..4ac3705e9d4ab90e93bf78ae579c1694ca2804e4 100644 (file)
--- a/bin/tests/system/sortlist/tests.sh
+++ b/bin/tests/system/sortlist/tests.sh
@@ -27,7 +27,7 @@ $DIG +tcp +noadd +nosea +nostat +noquest +noauth +nocomm +nocmd a.example. \
        @10.53.0.1 -b 10.53.0.1 -p 5300 >test1.dig
 # Note that this can't use digcomp.pl because here, the ordering of the
 # result RRs is significant.
-diff test1.dig test1.good || status=1
+$DIFF test1.dig test1.good || status=1
 
 echo "I:test 1-element sortlist statement and undocumented BIND 8 features"
        cat <<EOF >test2.good

diff --git a/bin/tests/system/staticstub/ns3/sign.sh b/bin/tests/system/staticstub/ns3/sign.sh
index f2e87023742725ffac0f7187b4573d4348954b2d..79a67c3955696b64f489b18948425a2842e642f1 100755 (executable)
--- a/bin/tests/system/staticstub/ns3/sign.sh
+++ b/bin/tests/system/staticstub/ns3/sign.sh
@@ -15,7 +15,7 @@ zonefile=example.db
 
 (cd ../ns4 && $SHELL -e sign.sh )
 
-cp ../ns4/dsset-sub.example. .
+cp ../ns4/dsset-sub.example$TP .
 
 keyname1=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 1024 -n zone $zone`
 keyname2=`$KEYGEN -q -r $RANDFILE -a RSASHA256 -b 2048 -f KSK -n zone $zone`

diff --git a/bin/tests/system/stop.pl b/bin/tests/system/stop.pl
index 4c7443fd5f0733a432bc0f19246f3e12e1d5b9b0..a2cd5b5ae6772f60f76fb321eab9c1aaf24377fc 100644 (file)
--- a/bin/tests/system/stop.pl
+++ b/bin/tests/system/stop.pl
@@ -134,7 +134,7 @@ sub stop_rndc {
        my $ip = "10.53.0.$1";
 
        # Ugly, but should work.
-       system("$ENV{RNDC} -c $testdir/../common/rndc.conf -s $ip -p 9953 stop | sed 's/^/I:$server /'");
+       system("$ENV{RNDC} -c ../common/rndc.conf -s $ip -p 9953 stop | sed 's/^/I:$server /'");
        return;
 }
 

diff --git a/bin/tests/system/wildcard/ns1/sign.sh b/bin/tests/system/wildcard/ns1/sign.sh
index 581bc829ee5137eefcbf4d1529259fbd6743b4ac..603c928e2b5881ed409007848c14a9a49de29f8f 100755 (executable)
--- a/bin/tests/system/wildcard/ns1/sign.sh
+++ b/bin/tests/system/wildcard/ns1/sign.sh
@@ -17,7 +17,7 @@ zone=dlv.
 infile=dlv.db.in
 zonefile=dlv.db
 outfile=dlv.db.signed
-dssets="$dssets dsset-$zone"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
@@ -31,7 +31,7 @@ zone=nsec.
 infile=nsec.db.in
 zonefile=nsec.db
 outfile=nsec.db.signed
-dssets="$dssets dsset-$zone"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a RSASHA1 -b 1024 -n zone $zone 2> /dev/null`
@@ -68,7 +68,7 @@ zone=nsec3.
 infile=nsec3.db.in
 zonefile=nsec3.db
 outfile=nsec3.db.signed
-dssets="$dssets dsset-$zone"
+dssets="$dssets dsset-`echo $zone |sed -e "s/.$//g"`$TP"
 
 keyname1=`$KEYGEN -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null` 
 keyname2=`$KEYGEN -f KSK -r $RANDFILE -a NSEC3RSASHA1 -b 1024 -n zone $zone 2> /dev/null`

diff --git a/win32utils/Configure b/win32utils/Configure
index bc242688e97265e47a877f9b13cfa778e148fe9b..b6c695be1c4c12d602da8881fa24c3687e3806d6 100644 (file)
--- a/win32utils/Configure
+++ b/win32utils/Configure
@@ -473,11 +473,6 @@ my @substsystest = ("CHECK_DSA",
                                        "XMLSTATS",
                                        "ZLIB"),
 
-# Configure variables for bin/tests/system/conf.sh.win.in - for cygwin
-$configsystest{"CURL"} = "/bin/curl";
-$configsystest{"PERL"} = "/usr/bin/perl";
-$configsystest{"SHELL"} = "\"/bin/bash -o igncr\"";
-
                                        
 # defines