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

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

6 files changed, 11 insertions, 35 deletions

diff --git a/configure.ac b/configure.ac
index dc9436fad..874372901 100644
--- a/configure.ac
+++ b/configure.ac
@@ -364,7 +364,6 @@ AC_CONFIG_FILES(
   tests/tac/Makefile
   tests/tail-2/Makefile
   tests/tail/Makefile
-  tests/tee/Makefile
   tests/test/Makefile
   tests/touch/Makefile
   tests/tr/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 222dbe61b..b1865b369 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -46,7 +46,7 @@ EXTRA_DIST =		\
 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 tac tail tail-2 tee test touch tr \
+  sha1sum shred sort stty tac tail tail-2 test touch tr \
   uniq wc
 ## N O T E :: Please do not add new directories.
 
diff --git a/tests/misc/Makefile.am b/tests/misc/Makefile.am
index 0d283b342..699835309 100644
--- a/tests/misc/Makefile.am
+++ b/tests/misc/Makefile.am
@@ -104,6 +104,8 @@ TESTS = \
   sum \
   sum-sysv \
   tac-continue \
+  tee \
+  tee-dash \
   test-diag \
   tsort \
   tty-eof \
diff --git a/tests/tee/basic b/tests/misc/tee
index 296ff5e4b..6da34a665 100755
--- a/tests/tee/basic
+++ b/tests/misc/tee
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test for basic tee functionality.
 
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -21,27 +21,18 @@ if test "$VERBOSE" = yes; then
   tee --version
 fi
 
-pwd=`pwd`
-t0=`echo "$0" |sed 's,.*/,,'`.tmp; tmp=$t0/$$
-trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
-trap 'status=$?; (exit $status); exit $status' 1 2 13 15
+. $srcdir/../test-lib.sh
 
-fail=0
-mkdir -p $tmp && cd $tmp || fail=1
-echo line >sample || fail=1
-nums=`seq 9` || fail=1
-
-if test $fail = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
+echo line >sample || framework_failure
+nums=`seq 9` || framework_failure
 
+fail=0
 for n in 0 $nums; do
 	files=`seq $n`
 	rm -f $files
 	tee $files <sample >out || fail=1
 	for f in out $files; do
-		cmp sample $f || fail=1
+		compare sample $f || fail=1
 	done
 done
 
diff --git a/tests/tee/dash b/tests/misc/tee-dash
index a5e06a9a1..3e4ecd6f0 100755
--- a/tests/tee/dash
+++ b/tests/misc/tee-dash
@@ -1,7 +1,7 @@
 #!/bin/sh
 # test for "tee -".
 
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 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
@@ -21,19 +21,9 @@ if test "$VERBOSE" = yes; then
   tee --version
 fi
 
-pwd=`pwd`
-t0=`echo "$0" |sed 's,.*/,,'`.tmp; tmp=$t0/$$
-trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
-trap 'status=$?; (exit $status); exit $status' 1 2 13 15
+. $srcdir/../test-lib.sh
 
 fail=0
-mkdir -p $tmp && cd $tmp || fail=1
-
-if test $fail = 1; then
-  echo "$0: failure in testing framework" 1>&2
-  (exit 1); exit 1
-fi
-
 tee - </dev/null || fail=1
 
 (exit $fail); exit $fail
diff --git a/tests/tee/Makefile.am b/tests/tee/Makefile.am
deleted file mode 100644
index 48f3239af..000000000
--- a/tests/tee/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-## Process this file with automake to produce Makefile.in -*-Makefile-*-.
-TESTS = basic dash
-EXTRA_DIST = $(TESTS)
-TESTS_ENVIRONMENT = \
-  CU_TEST_NAME=`basename $(abs_srcdir)`,$$tst \
-  PATH="$(VG_PATH_PREFIX)`pwd`/../../src$(PATH_SEPARATOR)$$PATH"