diff options
| author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-05-02 10:06:33 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2014-05-02 10:06:33 +0200 |
| commit | 17f1d3b04859dd43e9d1ad3ea5f100fd6e708cea (patch) | |
| tree | 16a0b0b45dcdea735c45ed88393edcb49c390452 /tests | |
| parent | 9159e8a770f474e7934b1b7db54cd9d347753b34 (diff) | |
| download | gnutls-17f1d3b04859dd43e9d1ad3ea5f100fd6e708cea.tar.gz | |
Allow testrng test to run with older versions of dieharder.
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/suite/testrng | 16 |
1 files changed, 8 insertions, 8 deletions
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=$? |