From: Nikos Mavrogiannopoulos <nmav@redhat.com>
Date: Fri, 2 May 2014 08:06:33 +0000 (+0200)
Subject: Allow testrng test to run with older versions of dieharder.
X-Git-Tag: gnutls_3_3_2~29
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17f1d3b04859dd43e9d1ad3ea5f100fd6e708cea;p=thirdparty%2Fgnutls.git

Allow testrng test to run with older versions of dieharder.
---

diff --git a/tests/suite/testrng b/tests/suite/testrng
index e49432e757..b4f21822b1 100755
--- a/tests/suite/testrng
+++ b/tests/suite/testrng
@@ -44,8 +44,8 @@ rm -f $RNGFILE2
 RINPUTNO=`dieharder -g -1|grep file_input_raw|cut -d '|' -f 2|cut -d ' ' -f 1`
 
 if test -z "$RINPUTNO";then
-	echo "Cannot determine dieharder option for raw file input"
-	exit 1
+	echo "Cannot determine dieharder option for raw file input, assuming 201"
+	RINPUTNO=201
 fi
 
 echo "Testing nonce PRNG"
@@ -62,9 +62,9 @@ fi
 
 ./rng nonce 100000000 $RNGFILE
 
-dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
+dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
 if ! test -z "$OPTIONS2";then
-	dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
+	dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
 fi
 grep FAILED $OUTFILE >/dev/null 2>&1
 ret=$?
@@ -97,9 +97,9 @@ fi
 
 ./rng key 100000000 $RNGFILE
 
-dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
+dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
 if ! test -z "$OPTIONS2";then
-	dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
+	dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
 fi
 grep FAILED $OUTFILE >/dev/null 2>&1 
 ret=$?
@@ -122,9 +122,9 @@ rm -f $OUTFILE
 echo "Testing /dev/zero PRNG"
 dd if=/dev/zero of=$RNGFILE bs=4 count=10000000 >/dev/null 2>&1
 
-dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
+dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS >$OUTFILE 2>&1
 if ! test -z "$OPTIONS2";then
-	dieharder -q -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
+	dieharder -f $RNGFILE -g $RINPUTNO $OPTIONS2 >>$OUTFILE 2>&1
 fi
 grep PASSED $OUTFILE >/dev/null 2>&1 
 ret=$?