mirror of
git://git.sv.gnu.org/coreutils.git
synced 2026-02-13 10:52:09 +02:00
tests: remove test-lib.sh; now all tests use gnulib's init.sh
* tests/test-lib.sh: Remove file. No longer used. * tests/Makefile.am (EXTRA_DIST): Remove it here, too. * tests/sample-test: Correct a comment.
This commit is contained in:
@@ -16,7 +16,6 @@ EXTRA_DIST = \
|
||||
other-fs-tmpdir \
|
||||
require-perl \
|
||||
sample-test \
|
||||
test-lib.sh \
|
||||
$(pr_data)
|
||||
|
||||
root_tests = \
|
||||
|
||||
@@ -22,7 +22,7 @@ test "$VERBOSE" = yes && FIXME --version
|
||||
# FIXME: skip_if_root_
|
||||
# FIXME: require_root_
|
||||
|
||||
# If used, these must *follow* test-lib.sh.
|
||||
# If used, these must *follow* init.sh.
|
||||
# FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; }
|
||||
# FIXME: . "$abs_srcdir/other-fs-tmpdir"
|
||||
|
||||
|
||||
@@ -1,81 +0,0 @@
|
||||
# source this file; set up for tests
|
||||
|
||||
# Copyright (C) 2009-2010 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Skip this test if the shell lacks support for functions.
|
||||
unset function_test
|
||||
eval 'function_test() { return 11; }; function_test'
|
||||
if test $? != 11; then
|
||||
echo "$0: /bin/sh lacks support for functions; skipping this test." 1>&2
|
||||
Exit 77
|
||||
fi
|
||||
|
||||
# We use a trap below for cleanup. This requires us to go through
|
||||
# hoops to get the right exit status transported through the signal.
|
||||
# So use `Exit STATUS' instead of `exit STATUS' inside of the tests.
|
||||
# Turn off errexit here so that we don't trip the bug with OSF1/Tru64
|
||||
# sh inside this function.
|
||||
Exit ()
|
||||
{
|
||||
set +e
|
||||
(exit $1)
|
||||
exit $1
|
||||
}
|
||||
|
||||
test -f "$srcdir/init.cfg" \
|
||||
&& . "$srcdir/init.cfg"
|
||||
|
||||
test_dir_=$(pwd)
|
||||
|
||||
this_test_() { echo "./$0" | sed 's,.*/,,'; }
|
||||
this_test=$(this_test_)
|
||||
|
||||
# This is a stub function that is run upon trap (upon regular exit and
|
||||
# interrupt). Override it with a per-test function, e.g., to unmount
|
||||
# a partition, or to undo any other global state changes.
|
||||
cleanup_() { :; }
|
||||
|
||||
t_=$("$abs_top_builddir/src/mktemp" -d --tmp="$test_dir_" cu-$this_test.XXXXXXXXXX)\
|
||||
|| error_ "failed to create temporary directory in $test_dir_"
|
||||
|
||||
remove_tmp_()
|
||||
{
|
||||
__st=$?
|
||||
cleanup_
|
||||
cd "$test_dir_" && chmod -R u+rwx "$t_" && rm -rf "$t_" && exit $__st
|
||||
}
|
||||
|
||||
# Run each test from within a temporary sub-directory named after the
|
||||
# test itself, and arrange to remove it upon exception or normal exit.
|
||||
trap remove_tmp_ 0
|
||||
trap 'Exit 129' 1
|
||||
trap 'Exit 130' 2
|
||||
trap 'Exit 131' 3
|
||||
trap 'Exit 141' 13
|
||||
trap 'Exit 143' 15
|
||||
|
||||
cd "$t_" || error_ "failed to cd to $t_"
|
||||
|
||||
if ( diff --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then
|
||||
compare() { diff -u "$@"; }
|
||||
elif ( cmp --version < /dev/null 2>&1 | grep GNU ) 2>&1 > /dev/null; then
|
||||
compare() { cmp -s "$@"; }
|
||||
else
|
||||
compare() { cmp "$@"; }
|
||||
fi
|
||||
|
||||
# Initialize; all bourne shell scripts end with "Exit $fail".
|
||||
fail=0
|
||||
Reference in New Issue
Block a user