Move the sole test in tests/tsort/ to tests/misc/tsort.

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

5 files changed, 4 insertions, 18 deletions

diff --git a/configure.ac b/configure.ac
index 98393e499..e79a351e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -369,7 +369,6 @@ AC_CONFIG_FILES(
   tests/test/Makefile
   tests/touch/Makefile
   tests/tr/Makefile
-  tests/tsort/Makefile
   tests/uniq/Makefile
   tests/wc/Makefile
   )
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aeae39557..f942dcd91 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -47,7 +47,7 @@ SUBDIRS = \
   chgrp chmod chown cp cut dd du head \
   install join ln ls ls-2 misc mkdir mv od pr readlink rm rmdir \
   sha1sum shred sort stty sum tac tail tail-2 tee test touch tr \
-  tsort uniq wc
+  uniq wc
 ## N O T E :: Please do not add new directories.
 
 all_t = t1 t2 t3 t4 t5 t6 t7 t8 t9
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 7decb29fd..6b7d279c3 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -103,6 +103,7 @@ TESTS = \
   stat-printf \
   tac-continue \
   test-diag \
+  tsort \
   tty-eof \
   unexpand
 
diff --git a/tests/tsort/basic-1 b/tests/misc/tsort
index e8dce60da..790502034 100755
--- a/tests/tsort/basic-1
+++ b/tests/misc/tsort
@@ -2,8 +2,7 @@
 # -*- perl -*-
 # Test "tsort".
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003-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
@@ -76,7 +75,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 = 'tsort';
 my $fail = run_tests ($program_name, $prog, \@Tests, $save_temps, $verbose);
 exit $fail;
 EOF
diff --git a/tests/tsort/Makefile.am b/tests/tsort/Makefile.am
deleted file mode 100644
index 389cf88ea..000000000
--- a/tests/tsort/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=tsort
-
-TESTS = basic-1