From: Mark Andrews <marka@isc.org>
Date: Mon, 9 Sep 2013 02:19:30 +0000 (+1000)
Subject: use -r rather then -f
X-Git-Tag: v9.10.0a1~117
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3d3aa9cde6d1f7b7da8faae90d6d87a376ed99a3;p=thirdparty%2Fbind9.git

use -r rather then -f
---

diff --git a/bin/tests/system/inline/ns3/sign.sh b/bin/tests/system/inline/ns3/sign.sh
index 8eb17e94c22..b35d4b1af2c 100644
--- a/bin/tests/system/inline/ns3/sign.sh
+++ b/bin/tests/system/inline/ns3/sign.sh
@@ -109,7 +109,7 @@ then
 	sh ../../ecdsa/prereq.sh 2> /dev/null || continue
 fi
 
-test $alg = DSA -a ! -f /dev/random -a ! -f /dev/urandom && continue
+test $alg = DSA -a ! -r /dev/random -a ! -r /dev/urandom && continue
 
 k1=`$KEYGEN -q -r $RANDFILE -a $alg -b 1024 -n zone -f KSK $zone`
 k2=`$KEYGEN -q -r $RANDFILE -a $alg -b 1024 -n zone $zone`
diff --git a/bin/tests/system/inline/tests.sh b/bin/tests/system/inline/tests.sh
index 7aec281884e..53d96947198 100644
--- a/bin/tests/system/inline/tests.sh
+++ b/bin/tests/system/inline/tests.sh
@@ -823,7 +823,8 @@ do
    then
 	sh ../ecdsa/prereq.sh 2>/dev/null || continue;
    fi
-   test $alg = 3 -a ! -f /dev/random -a ! -f /dev/random && continue
+   test $alg = 3 -a ! -r /dev/random -a ! -r /dev/urandom && continue
+   echo "I: checking $alg"
 
    dnskeys=`grep "IN.DNSKEY.25[67] [0-9]* $alg " dig.out.ns3.test$n | wc -l`
    rrsigs=`grep "RRSIG.DNSKEY $alg " dig.out.ns3.test$n | wc -l`