From 44629cf147ba5c3827b5252e36ce50ce447b36b8 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 11 Sep 2007 23:30:09 +0200 Subject: 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 --- configure.ac | 1 - tests/Makefile.am | 2 +- tests/misc/Makefile.am | 2 ++ tests/misc/tee | 39 +++++++++++++++++++++++++++++++++++++++ tests/misc/tee-dash | 29 +++++++++++++++++++++++++++++ tests/tee/Makefile.am | 6 ------ tests/tee/basic | 48 ------------------------------------------------ tests/tee/dash | 39 --------------------------------------- 8 files changed, 71 insertions(+), 95 deletions(-) create mode 100755 tests/misc/tee create mode 100755 tests/misc/tee-dash delete mode 100644 tests/tee/Makefile.am delete mode 100755 tests/tee/basic delete mode 100755 tests/tee/dash 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/misc/tee b/tests/misc/tee new file mode 100755 index 000000000..6da34a665 --- /dev/null +++ b/tests/misc/tee @@ -0,0 +1,39 @@ +#!/bin/sh +# test for basic tee functionality. + +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if test "$VERBOSE" = yes; then + set -x + tee --version +fi + +. $srcdir/../test-lib.sh + +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 out || fail=1 + for f in out $files; do + compare sample $f || fail=1 + done +done + +(exit $fail); exit $fail diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash new file mode 100755 index 000000000..3e4ecd6f0 --- /dev/null +++ b/tests/misc/tee-dash @@ -0,0 +1,29 @@ +#!/bin/sh +# test for "tee -". + +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +if test "$VERBOSE" = yes; then + set -x + tee --version +fi + +. $srcdir/../test-lib.sh + +fail=0 +tee - . - -if test "$VERBOSE" = yes; then - set -x - 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 - -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 - -for n in 0 $nums; do - files=`seq $n` - rm -f $files - tee $files out || fail=1 - for f in out $files; do - cmp sample $f || fail=1 - done -done - -(exit $fail); exit $fail diff --git a/tests/tee/dash b/tests/tee/dash deleted file mode 100755 index a5e06a9a1..000000000 --- a/tests/tee/dash +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# test for "tee -". - -# Copyright (C) 2005, 2006 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -if test "$VERBOSE" = yes; then - set -x - 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 - -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 -