[master] use test -r in system tests

3806.	[test]		Improved system test portability. [RT #35625]

diff --git a/CHANGES b/CHANGES
index 08c8d2a7d2e28bbd80d092b9b7d3bbb0a4a5067e..1ed9c7e08e48d4bf1b4cccff8210736019013907 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+3806.  [test]          Improved system test portability. [RT #35625]
+
 3805.  [contrib]       Added contrib/perftcpdns, a performance testing tool
                        for DNS over TCP. [RT #35710]
 

diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh
index 39c655cea9000afe8df997a196e7ea23108356e3..50c004891154aceed2d93f00b76949b0b5f05850 100644 (file)
--- a/bin/tests/system/autosign/setup.sh
+++ b/bin/tests/system/autosign/setup.sh
@@ -19,7 +19,7 @@ SYSTEMTESTTOP=..
 
 . ./clean.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 echo "I:generating keys and preparing zones"
 cd ns1 && sh keygen.sh

diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh
index ceb3e80a36a7723e490ee389d966235e3c34bb85..c75b00cae13e6f8a59603b9c407dc9eb8da13e97 100644 (file)
--- a/bin/tests/system/dlv/setup.sh
+++ b/bin/tests/system/dlv/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 (cd ns1 && sh -e sign.sh)

diff --git a/bin/tests/system/dlvauto/setup.sh b/bin/tests/system/dlvauto/setup.sh
index 39cba4cfefe686c436e20864322ea1dcb7921a54..774050079ab502c8b4c696cac13e35d215972a26 100644 (file)
--- a/bin/tests/system/dlvauto/setup.sh
+++ b/bin/tests/system/dlvauto/setup.sh
@@ -19,6 +19,6 @@ SYSTEMTESTTOP=..
 
 sh clean.sh 
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh

diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh
index f90301193fa9120d12747fb75e152f7ab4e75ecb..38a51aea03eb939eb1c4235f8cbab190f752b187 100644 (file)
--- a/bin/tests/system/dlzexternal/setup.sh
+++ b/bin/tests/system/dlzexternal/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key

diff --git a/bin/tests/system/dns64/setup.sh b/bin/tests/system/dns64/setup.sh
index 854c8ee95a67b14bcdf230b3d8b1814637d164d7..f9700cdde64ae9f9e2616c7bd03d5f60dc60dd45 100644 (file)
--- a/bin/tests/system/dns64/setup.sh
+++ b/bin/tests/system/dns64/setup.sh
@@ -19,6 +19,6 @@ sh clean.sh
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh

diff --git a/bin/tests/system/dnssec/setup.sh b/bin/tests/system/dnssec/setup.sh
index 983c716d8f1c7d59595c10c166244a9e4850ceed..4d5ee498e59275ba0ddd145af3d786f68d0e495f 100644 (file)
--- a/bin/tests/system/dnssec/setup.sh
+++ b/bin/tests/system/dnssec/setup.sh
@@ -20,7 +20,7 @@ SYSTEMTESTTOP=..
 
 sh clean.sh 
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh
 

diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh
index 998f9b43dc01a702b7262689fb8a9ba0d499d6cc..74b5270e7dcabc3915e079a3920e06042916fc64 100644 (file)
--- a/bin/tests/system/dsdigest/setup.sh
+++ b/bin/tests/system/dsdigest/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh

diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh
index 998f9b43dc01a702b7262689fb8a9ba0d499d6cc..74b5270e7dcabc3915e079a3920e06042916fc64 100644 (file)
--- a/bin/tests/system/ecdsa/setup.sh
+++ b/bin/tests/system/ecdsa/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh

diff --git a/bin/tests/system/filter-aaaa/setup.sh b/bin/tests/system/filter-aaaa/setup.sh
index 63752a17e8806c0723668d0b07885b8c38b8b68b..f86f4dc6b65ef57a85aa0bee088107fbd3313ff0 100644 (file)
--- a/bin/tests/system/filter-aaaa/setup.sh
+++ b/bin/tests/system/filter-aaaa/setup.sh
@@ -19,7 +19,7 @@ sh clean.sh
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cp ns1/named1.conf ns1/named.conf
 cp ns2/named1.conf ns2/named.conf

diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh
index 20633c8640a3fe280903ae0afee3ddad8dc8024c..de5e80acb1ccf3aa81687ea7692439d5ebf5fd85 100644 (file)
--- a/bin/tests/system/gost/setup.sh
+++ b/bin/tests/system/gost/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh sign.sh

diff --git a/bin/tests/system/inline/setup.sh b/bin/tests/system/inline/setup.sh
index 2448f11e93465201acc4e5338d9a4e2d6cb00a46..dea15961ac224958bbade9fd062c112272465578 100644 (file)
--- a/bin/tests/system/inline/setup.sh
+++ b/bin/tests/system/inline/setup.sh
@@ -17,7 +17,7 @@ sh clean.sh
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cp ns1/root.db.in ns1/root.db
 rm -f ns1/root.db.signed

diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh
index 039a7cced13a67b29630448318e0804422cf0959..aa6f9e0a4f6ad98e563e7f6698cf56b3a1308f3b 100755 (executable)
--- a/bin/tests/system/masterformat/setup.sh
+++ b/bin/tests/system/masterformat/setup.sh
@@ -15,7 +15,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 rm -f named-compilezone
 ln -s $CHECKZONE named-compilezone

diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh
index 9fc08e9ff13c568d5852500045bd734eeb3fcb4f..95e03e54a3b6f78a0ab29e5544af64274a75a470 100644 (file)
--- a/bin/tests/system/metadata/setup.sh
+++ b/bin/tests/system/metadata/setup.sh
@@ -18,7 +18,7 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 sh ./clean.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 pzone=parent.nil
 czone=child.parent.nil

diff --git a/bin/tests/system/nsupdate/setup.sh b/bin/tests/system/nsupdate/setup.sh
index 93c6e7166e8f130ea32fad8313e13feccd000790..31d1562345f6561756441d01ef12a6be0ab719df 100644 (file)
--- a/bin/tests/system/nsupdate/setup.sh
+++ b/bin/tests/system/nsupdate/setup.sh
@@ -18,7 +18,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 #
 # jnl and database files MUST be removed before we start

diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh
index 3c3d53fb150c2f3004220650279faa3dc24aade5..d1111ae1b695b1e8a0cc3dc6d0fb790092b67ab4 100644 (file)
--- a/bin/tests/system/pending/setup.sh
+++ b/bin/tests/system/pending/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh -e sign.sh

diff --git a/bin/tests/system/redirect/setup.sh b/bin/tests/system/redirect/setup.sh
index fd40110b8c8b127f09686c69ed117ba5ab88cd99..d134b1c5ac436e042adabb6778c2a2d26f6583dc 100644 (file)
--- a/bin/tests/system/redirect/setup.sh
+++ b/bin/tests/system/redirect/setup.sh
@@ -20,7 +20,7 @@ SYSTEMTESTTOP=..
 
 sh clean.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cp ns2/redirect.db.in ns2/redirect.db
 cp ns2/example.db.in ns2/example.db

diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh
index 838842987ec053e8a01b8546e29cac10f7d9747b..f4c19d7dac4ab185907ed6bd882e972b260a9630 100644 (file)
--- a/bin/tests/system/resolver/setup.sh
+++ b/bin/tests/system/resolver/setup.sh
@@ -17,7 +17,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cp ns4/tld1.db ns4/tld.db
 cp ns6/to-be-removed.tld.db.in ns6/to-be-removed.tld.db

diff --git a/bin/tests/system/rndc/setup.sh b/bin/tests/system/rndc/setup.sh
index fd0ad4c0a4d3403ad1436e6dc6542d05b8f4c9b7..459a4f4744a6df5e3963ca42832f949efa042d7a 100644 (file)
--- a/bin/tests/system/rndc/setup.sh
+++ b/bin/tests/system/rndc/setup.sh
@@ -21,7 +21,7 @@ SYSTEMTESTTOP=..
 
 sh clean.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 sh ../genzone.sh 2 >ns2/nil.db
 sh ../genzone.sh 2 >ns2/other.db

diff --git a/bin/tests/system/rpz/setup.sh b/bin/tests/system/rpz/setup.sh
index 46690aff0fb54f0f81644e07a020518bebbe53a6..9355c649e5445518d647a8535bf7d39a74196cd7 100644 (file)
--- a/bin/tests/system/rpz/setup.sh
+++ b/bin/tests/system/rpz/setup.sh
@@ -37,7 +37,7 @@ for NM in '' -2 -given -disabled -passthru -no-op -nodata -nxdomain -cname -wild
 done
 
 # sign the root and a zone in ns2
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 # $1=directory, $2=domain name, $3=input zone file, $4=output file
 signzone () {

diff --git a/bin/tests/system/rsabigexponent/prereq.sh b/bin/tests/system/rsabigexponent/prereq.sh
index 8203514908fa05248ada93bd51454b48cf472873..cfb51834704b176be6b820b5cc4bca9bb9da26c6 100644 (file)
--- a/bin/tests/system/rsabigexponent/prereq.sh
+++ b/bin/tests/system/rsabigexponent/prereq.sh
@@ -17,7 +17,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 if ./bigkey > /dev/null 2>&1
 then

diff --git a/bin/tests/system/rsabigexponent/setup.sh b/bin/tests/system/rsabigexponent/setup.sh
index 90e504788c5ef0bc49222aec17495ca75e416722..f1f51433cbf7d7aef3661f1d9ca38033ec6c62f9 100644 (file)
--- a/bin/tests/system/rsabigexponent/setup.sh
+++ b/bin/tests/system/rsabigexponent/setup.sh
@@ -19,6 +19,6 @@ sh clean.sh
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh -e sign.sh

diff --git a/bin/tests/system/smartsign/setup.sh b/bin/tests/system/smartsign/setup.sh
index 8ef4f9811eebeb77512cd8fe737ce032d1a209f1..33c13101e3d56b0e3f7240131ce70160a6f79462 100644 (file)
--- a/bin/tests/system/smartsign/setup.sh
+++ b/bin/tests/system/smartsign/setup.sh
@@ -18,4 +18,4 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 sh clean.sh
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE

diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh
index dba0b29b4d63815e40ce9b4c46db90ac2330f4da..ae552e63244bea20a2bbe436da1e66c9d50699be 100755 (executable)
--- a/bin/tests/system/staticstub/setup.sh
+++ b/bin/tests/system/staticstub/setup.sh
@@ -21,6 +21,6 @@ sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' ns2/named
 
 sed 's/EXAMPLE_ZONE_PLACEHOLDER/zone "example" { type master; file "example.db.signed"; };/' ns3/named.conf.in > ns3/named.conf
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns3 && sh -e sign.sh

diff --git a/bin/tests/system/testcrypto.sh b/bin/tests/system/testcrypto.sh
index c86966f9af6335ef9400a5ae622c7f9be2a8dd82..4cec7f4834474233265913af8d8af2a4f176f86c 100644 (file)
--- a/bin/tests/system/testcrypto.sh
+++ b/bin/tests/system/testcrypto.sh
@@ -17,7 +17,7 @@
 SYSTEMTESTTOP=${SYSTEMTESTTOP:=..}
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 prog=$0
 

diff --git a/bin/tests/system/tkey/setup.sh b/bin/tests/system/tkey/setup.sh
index 7a0cc1c387d5677d475fe64530d7a56e0cd509e7..488b5952e1ef84f7870ccf02ced0ff43e9587136 100644 (file)
--- a/bin/tests/system/tkey/setup.sh
+++ b/bin/tests/system/tkey/setup.sh
@@ -20,6 +20,6 @@ SYSTEMTESTTOP=..
 
 sh clean.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 cd ns1 && sh setup.sh

diff --git a/bin/tests/system/tsiggss/setup.sh b/bin/tests/system/tsiggss/setup.sh
index 84f9a1d6c54976175f836040866b38e0908f75e1..765334d713a7bbd4f400434ac64539d3c4d1c1a9 100644 (file)
--- a/bin/tests/system/tsiggss/setup.sh
+++ b/bin/tests/system/tsiggss/setup.sh
@@ -19,7 +19,7 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 rm -f ns1/*.jnl ns1/K*.key ns1/K*.private ns1/_default.tsigkeys
 

diff --git a/bin/tests/system/unknown/setup.sh b/bin/tests/system/unknown/setup.sh
index 415e896c348510bc282758625aace5ef810b2a4d..ea635f44f2b8ec5a3f8f748a6aa7c531d73d9005 100644 (file)
--- a/bin/tests/system/unknown/setup.sh
+++ b/bin/tests/system/unknown/setup.sh
@@ -16,6 +16,6 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 sh clean.sh 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 (cd ns3; sh -e sign.sh)

diff --git a/bin/tests/system/verify/setup.sh b/bin/tests/system/verify/setup.sh
index 5931aa314b8cfd4299f0e427c4bff535cb630262..01a9643e4c5b6c17af6e94ea1955ecd64adb7e2d 100644 (file)
--- a/bin/tests/system/verify/setup.sh
+++ b/bin/tests/system/verify/setup.sh
@@ -18,6 +18,6 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 sh clean.sh 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 (cd zones && sh genzones.sh)

diff --git a/bin/tests/system/wildcard/setup.sh b/bin/tests/system/wildcard/setup.sh
index c21d1af60532eca9e84d5aad6d0bba516aaadd3f..1720521e39150f25b9757623fa72e089a69880c0 100644 (file)
--- a/bin/tests/system/wildcard/setup.sh
+++ b/bin/tests/system/wildcard/setup.sh
@@ -17,6 +17,6 @@
 SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 (cd ns1 && sh -e sign.sh)

diff --git a/bin/tests/system/zonechecks/setup.sh b/bin/tests/system/zonechecks/setup.sh
index 977cc3be276e466bc1288e49efc209eaa135aee1..713903270bbb5a3f47fd011c7cc6e16f14f4044d 100644 (file)
--- a/bin/tests/system/zonechecks/setup.sh
+++ b/bin/tests/system/zonechecks/setup.sh
@@ -18,7 +18,7 @@ SYSTEMTESTTOP=..
 . $SYSTEMTESTTOP/conf.sh
 
 sh clean.sh
-test -e $RANDFILE || $GENRANDOM 400 $RANDFILE
+test -r $RANDFILE || $GENRANDOM 400 $RANDFILE
 
 sh ../genzone.sh 1 > ns1/master.db
 cd ns1