diff --git a/test/Makefile.am b/test/Makefile.am index 3a28300..4fac32a 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,11 +1,7 @@ -EXTRA_DIST = rng utils file-00 file-ff file-random file-text +EXTRA_DIST = $(TESTS) file-00 file-ff file-random file-text noinst_PROGRAMS = zzcat zzero bug-overflow bug-memory bug-div0 -TESTS = check-rng check-overflow check-memory check-div0 check-utils - -zzcat_SOURCES = zzcat.c - -zzero_SOURCES = zzero.c +TESTS = check-md5 check-overflow check-memory check-div0 check-rng check-utils diff --git a/test/check-div0 b/test/check-div0 index 899f2d5..c2effa7 100755 --- a/test/check-div0 +++ b/test/check-div0 @@ -22,32 +22,31 @@ echo "*** running zzuf division-by-zero test with seed $seed ***" echo "*** bug-div0 < /file-00" if ! $PROGRAM < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi -r0 bug-div0 < /file-00" if ! "$ZZUF" -r0 -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi bug-div0 < file-00" if "$ZZUF" -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" -echo "" if [ "$FAILED" != 0 ]; then echo "*** $FAILED tests failed out of $TESTED ***" exit 1 diff --git a/test/check-memory b/test/check-memory index 78f7fe3..48cab4e 100755 --- a/test/check-memory +++ b/test/check-memory @@ -22,32 +22,31 @@ echo "*** running zzuf buffer memory test with seed $seed ***" echo "*** bug-memory < /file-00" if ! $PROGRAM < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi -r0 bug-memory < /file-00" if ! "$ZZUF" -r0 -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi bug-memory < file-00" if "$ZZUF" -M 256 -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" -echo "" if [ "$FAILED" != 0 ]; then echo "*** $FAILED tests failed out of $TESTED ***" exit 1 diff --git a/test/check-overflow b/test/check-overflow index 9bcd171..6610541 100755 --- a/test/check-overflow +++ b/test/check-overflow @@ -22,32 +22,31 @@ echo "*** running zzuf buffer overflow test with seed $seed ***" echo "*** bug-overflow < /file-00" if ! $PROGRAM < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi -r0 bug-overflow < /file-00" if ! "$ZZUF" -r0 -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" echo "*** zzuf -qi bug-overflow < file-00" if "$ZZUF" -qi "$PROGRAM" < "$DIR/file-00"; then - echo "unexpected exit status $?" + echo " unexpected exit status $?" FAILED="$(($FAILED + 1))" else - echo "*** test OK ***" + echo " OK" fi TESTED="$(($TESTED + 1))" -echo "" if [ "$FAILED" != 0 ]; then echo "*** $FAILED tests failed out of $TESTED ***" exit 1 diff --git a/test/check-rng b/test/check-rng index 54ac2c6..203ca07 100755 --- a/test/check-rng +++ b/test/check-rng @@ -66,7 +66,6 @@ checkflip 0.001 167604 checkflip 0.01 1661055 checkflip 0.1 15205967 -echo "" if [ "$FAILED" != 0 ]; then echo "*** $FAILED tests failed out of $TESTED ***" exit 1 diff --git a/test/check-utils b/test/check-utils index a80411e..570c1d5 100755 --- a/test/check-utils +++ b/test/check-utils @@ -116,7 +116,6 @@ checkutils 0.001 checkutils 0.1 checkutils 10.0 -echo "" if [ "$FAILED" != 0 ]; then echo "*** $FAILED tests failed out of $TESTED ***" exit 1