.

3 files changed, 16 insertions, 315 deletions

diff --git a/tests/md5sum/.cvsignore b/tests/md5sum/.cvsignore
index 852508156..f3c7a7c5d 100644
--- a/tests/md5sum/.cvsignore
+++ b/tests/md5sum/.cvsignore
@@ -1,8 +1 @@
-*.I
-*.E
-*.X
-*.O
-*-tests
-build-script
 Makefile
-mk-script
diff --git a/tests/md5sum/Makefile.in b/tests/md5sum/Makefile.in
index 83f70b1cd..182f3fca2 100644
--- a/tests/md5sum/Makefile.in
+++ b/tests/md5sum/Makefile.in
@@ -1,9 +1,10 @@
-# Makefile.in generated automatically by automake 1.3 from Makefile.am
+# Makefile.in generated automatically by automake 1.3b from Makefile.am
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
+
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
@@ -31,7 +32,7 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DISTDIR =
+DESTDIR =
 
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -76,6 +77,7 @@ MAKEINFO = @MAKEINFO@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 PACKAGE = @PACKAGE@
+PERL = @PERL@
 POFILES = @POFILES@
 POSUB = @POSUB@
 POW_LIBM = @POW_LIBM@
@@ -86,28 +88,19 @@ USE_NLS = @USE_NLS@
 VERSION = @VERSION@
 l = @l@
 
-x = md5sum
-explicit =
-maint_gen = 1.I 1.X 2.I 2.X 3.I 3.X 4.I 4.X 5.I 5.X 6.I 6.X 7.I 7.X
-run_gen = 1.O 1.E 2.O 2.E 3.O 3.E 4.O 4.E 5.O 5.E 6.O 6.E 7.O 7.E
+EXTRA_DIST = $(TESTS)
 
-EXTRA_DIST = Test.pm $x-tests $(explicit) $(maint_gen)
-noinst_SCRIPTS = $x-tests
-
-PERL = @PERL@
-editpl = sed -e 's,@''PERL''@,$(PERL),g' -e 's,@''srcdir''@,@srcdir@,g'
+TESTS_ENVIRONMENT = \
+  top_srcdir=$(top_srcdir) \
+  srcdir=$(srcdir) \
+  PERL="@PERL@" \
+  PATH=../../src:$$PATH \
+  PROG=md5sum
 
-TESTS = $x-tests
-
-mk_script = $(srcdir)/../mk-script
-
-MAINTAINERCLEANFILES = $x-tests $(maint_gen)
-CLEANFILES = $(run_gen)
+TESTS = basic-1
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../../config.h
 CONFIG_CLEAN_FILES = 
-SCRIPTS =  $(noinst_SCRIPTS)
-
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -115,7 +108,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP = --best
-all: Makefile $(SCRIPTS)
+all: Makefile
 
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -173,7 +166,7 @@ check-TESTS: $(TESTS)
 info:
 dvi:
 check: all
-	$(MAKE) check-TESTS
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 installcheck:
 install-exec: 
 	@$(NORMAL_INSTALL)
@@ -187,24 +180,19 @@ install: install-exec install-data all
 uninstall: 
 
 install-strip:
-	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
 installdirs:
 
 
 mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
 
 clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
-	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
 
 maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 mostlyclean:  mostlyclean-generic
 
 clean:  clean-generic mostlyclean
@@ -221,21 +209,6 @@ install-data install uninstall all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
-$(srcdir)/$x-tests: $(mk_script) Test.pm
-	$(PERL) -I. -w -- $(mk_script) ../../src/$x > $@.n
-	mv $@.n $@
-	chmod 755 $@
-
-check: $(maint_gen)
-
-Makefile.am: ../Makefile.am.in Test.pm $(mk_script)
-	rm -f $@ $@t
-	sed -n '1,/^##test-files-begin/p' $< > $@t
-	tool=`echo $(subdir)|sed 's/^tests.//;s/-test//'`; \
-	  echo "x = $$tool" >> $@t
-	$(PERL) -I. -w -- $(mk_script) --list >> $@t
-	sed -n '/^##test-files-end/,$$p' $< >> $@t
-	mv $@t $@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/tests/md5sum/md5sum-tests b/tests/md5sum/md5sum-tests
deleted file mode 100755
index 2e28de463..000000000
--- a/tests/md5sum/md5sum-tests
+++ /dev/null
@@ -1,265 +0,0 @@
-#! /bin/sh
-# This script was generated automatically by build-script.
-case $# in
-  0) xx='../../src/md5sum';;
-  *) xx="$1";;
-esac
-test "$VERBOSE" && echo=echo || echo=:
-$echo testing program: $xx
-errors=0
-test "$srcdir" || srcdir=.
-test "$VERBOSE" && $xx --version 2> /dev/null
-
-# Make sure we get English translations.
-LANGUAGE=C
-export LANGUAGE
-LC_ALL=C
-export LC_ALL
-LANG=C
-export LANG
-
-cat $srcdir/1.I | $xx  > 1.O 2> 1.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 1(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 1.O $srcdir/1.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 1(|)"; fi ;;
-    1) $echo "Test 1(|) failed: files 1.O and $srcdir/1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 1(|) may have failed." 1>&2;
-       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 1.E || rm -f 1.E
-$xx  < $srcdir/1.I > 1.O 2> 1.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 1(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 1.O $srcdir/1.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 1(<)"; fi ;;
-    1) $echo "Test 1(<) failed: files 1.O and $srcdir/1.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 1(<) may have failed." 1>&2;
-       $echo The command "cmp 1.O $srcdir/1.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 1.E || rm -f 1.E
-cat $srcdir/2.I | $xx  > 2.O 2> 2.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 2(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 2.O $srcdir/2.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 2(|)"; fi ;;
-    1) $echo "Test 2(|) failed: files 2.O and $srcdir/2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 2(|) may have failed." 1>&2;
-       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 2.E || rm -f 2.E
-$xx  < $srcdir/2.I > 2.O 2> 2.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 2(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 2.O $srcdir/2.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 2(<)"; fi ;;
-    1) $echo "Test 2(<) failed: files 2.O and $srcdir/2.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 2(<) may have failed." 1>&2;
-       $echo The command "cmp 2.O $srcdir/2.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 2.E || rm -f 2.E
-cat $srcdir/3.I | $xx  > 3.O 2> 3.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 3(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 3.O $srcdir/3.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 3(|)"; fi ;;
-    1) $echo "Test 3(|) failed: files 3.O and $srcdir/3.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 3(|) may have failed." 1>&2;
-       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 3.E || rm -f 3.E
-$xx  < $srcdir/3.I > 3.O 2> 3.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 3(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 3.O $srcdir/3.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 3(<)"; fi ;;
-    1) $echo "Test 3(<) failed: files 3.O and $srcdir/3.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 3(<) may have failed." 1>&2;
-       $echo The command "cmp 3.O $srcdir/3.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 3.E || rm -f 3.E
-cat $srcdir/4.I | $xx  > 4.O 2> 4.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 4(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 4.O $srcdir/4.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 4(|)"; fi ;;
-    1) $echo "Test 4(|) failed: files 4.O and $srcdir/4.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 4(|) may have failed." 1>&2;
-       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 4.E || rm -f 4.E
-$xx  < $srcdir/4.I > 4.O 2> 4.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 4(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 4.O $srcdir/4.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 4(<)"; fi ;;
-    1) $echo "Test 4(<) failed: files 4.O and $srcdir/4.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 4(<) may have failed." 1>&2;
-       $echo The command "cmp 4.O $srcdir/4.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 4.E || rm -f 4.E
-cat $srcdir/5.I | $xx  > 5.O 2> 5.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 5(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 5.O $srcdir/5.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 5(|)"; fi ;;
-    1) $echo "Test 5(|) failed: files 5.O and $srcdir/5.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 5(|) may have failed." 1>&2;
-       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 5.E || rm -f 5.E
-$xx  < $srcdir/5.I > 5.O 2> 5.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 5(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 5.O $srcdir/5.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 5(<)"; fi ;;
-    1) $echo "Test 5(<) failed: files 5.O and $srcdir/5.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 5(<) may have failed." 1>&2;
-       $echo The command "cmp 5.O $srcdir/5.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 5.E || rm -f 5.E
-cat $srcdir/6.I | $xx  > 6.O 2> 6.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 6(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 6.O $srcdir/6.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 6(|)"; fi ;;
-    1) $echo "Test 6(|) failed: files 6.O and $srcdir/6.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 6(|) may have failed." 1>&2;
-       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 6.E || rm -f 6.E
-$xx  < $srcdir/6.I > 6.O 2> 6.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 6(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 6.O $srcdir/6.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 6(<)"; fi ;;
-    1) $echo "Test 6(<) failed: files 6.O and $srcdir/6.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 6(<) may have failed." 1>&2;
-       $echo The command "cmp 6.O $srcdir/6.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 6.E || rm -f 6.E
-cat $srcdir/7.I | $xx  > 7.O 2> 7.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 7(|) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 7.O $srcdir/7.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 7(|)"; fi ;;
-    1) $echo "Test 7(|) failed: files 7.O and $srcdir/7.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 7(|) may have failed." 1>&2;
-       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 7.E || rm -f 7.E
-$xx  < $srcdir/7.I > 7.O 2> 7.E
-code=$?
-if test $code != 0 ; then
-  $echo "Test 7(<) failed: ../../src/md5sum return code $code differs from expected value 0" 1>&2
-  errors=`expr $errors + 1`
-else
-  cmp 7.O $srcdir/7.X > /dev/null 2>&1
-  case $? in
-    0) if test "$VERBOSE" ; then $echo "passed 7(<)"; fi ;;
-    1) $echo "Test 7(<) failed: files 7.O and $srcdir/7.X differ" 1>&2;
-       errors=`expr $errors + 1` ;;
-    2) $echo "Test 7(<) may have failed." 1>&2;
-       $echo The command "cmp 7.O $srcdir/7.X" failed. 1>&2 ;
-       errors=`expr $errors + 1` ;;
-  esac
-fi
-test -s 7.E || rm -f 7.E
-if test $errors = 0 ; then
-  $echo Passed all 14 tests. 1>&2
-else
-  $echo Failed $errors tests. 1>&2
-fi
-test $errors = 0 || errors=1
-exit $errors