Move the two tests in tests/md5sum to tests/misc/md5sum.

* tests/md5sum/basic-1: Move this file to ...
* tests/misc/md5sum: ...here.  Don't rely on $PROG in env.
* tests/md5sum/newline-1: Move this file to ...
* tests/misc/md5sum-newline: ...here.  Don't rely on $PROG in env.
* tests/misc/Makefile.am (TESTS): Add md5sum.
* tests/Makefile.am (SUBDIRS): Remove md5sum.
* tests/md5sum: Remove the directory.
* configure.ac (AC_CONFIG_FILES): Remove tests/md5sum/Makefile

5 files changed, 7 insertions, 18 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index be36fb87a..1984235b6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,7 +45,7 @@ EXTRA_DIST =		\
 ## There are too many already.  Put new tests in misc/.
 SUBDIRS = \
   chgrp chmod chown cp cut dd du head \
-  install join ln ls ls-2 md5sum misc mkdir mv od pr readlink rm rmdir \
+  install join ln ls ls-2 misc mkdir mv od pr readlink rm rmdir \
   seq sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
   tsort unexpand uniq wc
 ## N O T E :: Please do not add new directories.
diff --git a/tests/md5sum/Makefile.am b/tests/md5sum/Makefile.am
deleted file mode 100644
index 0ed74e035..000000000
--- a/tests/md5sum/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-
-EXTRA_DIST = $(TESTS)
-
-TESTS_ENVIRONMENT = \
-  top_srcdir=$(top_srcdir) \
-  srcdir=$(srcdir) \
-  PERL="$(PERL)" \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH" \
-  PROG=md5sum
-
-TESTS = basic-1 newline-1
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index faf9e49da..1d5334e19 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -75,6 +75,8 @@ TESTS = \
   groups-version \
   head-c \
   head-pos \
+  md5sum \
+  md5sum-newline \
   mknod \
   nice \
   nl \
diff --git a/tests/md5sum/basic-1 b/tests/misc/md5sum
index 7b56e64f7..43407a40e 100755
--- a/tests/md5sum/basic-1
+++ b/tests/misc/md5sum
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Basic tests for "md5sum".
 
-# Copyright (C) 1998, 1999, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2003, 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -82,7 +82,7 @@ foreach $t (@Tests)
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'md5sum';
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
 EOF
diff --git a/tests/md5sum/newline-1 b/tests/misc/md5sum-newline
index 5e16b9c90..22717d41e 100755
--- a/tests/md5sum/newline-1
+++ b/tests/misc/md5sum-newline
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Newline tests for "md5sum".
 
-# Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2005, 2007 Free Software Foundation, Inc.
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ my @Tests =
 my $save_temps = $ENV{DEBUG};
 my $verbose = $ENV{VERBOSE};
 
-my $prog = $ENV{PROG} || die "$0: \$PROG not specified in environment\n";
+my $prog = 'md5sum';
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
 EOF