From f38becab02472e6872048a1951b249b2a3c054df Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Sun, 14 Nov 2010 11:05:05 +0100 Subject: tests: convert first batch of tests from test-lib.sh to init.sh Initially, I did this, git grep -l srcdir/test-lib.sh|xargs perl -p0i -e '~180-byte script' but that line would have been much longer than the maximum permitted by coreutils' commit hook, and wasn't readable besides, so here's a more readable version: lhs=$(printf '%s\\n' \ 'if test "$VERBOSE" = yes; then' \ ' set -x' \ ' touch --version' \ 'fi' \ '' \ '. $srcdir/test-lib.sh' \ | sed 's/\$/\\\$/g;s/touch/(\\w+)/') rhs=$(printf '%s\\n' \ '. "${srcdir=.}/init.sh"; path_prepend_ ../src' \ 'test "$VERBOSE" = yes && FIXME --version' \ | sed 's/\$/\\\$/g;s/FIXME/\$1/') git grep -l srcdir/test-lib.sh|xargs perl -p0i -e "s,$lhs,$rhs," --- tests/rm/sunos-1 | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tests/rm/sunos-1') diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1 index be988e11f..3057ecbbd 100755 --- a/tests/rm/sunos-1 +++ b/tests/rm/sunos-1 @@ -22,12 +22,8 @@ # actually remove files with names of entries in the current directory # but relative to `/' rather than relative to the current directory. -if test "$VERBOSE" = yes; then - set -x - rm --version -fi - -. $srcdir/test-lib.sh +. "${srcdir=.}/init.sh"; path_prepend_ ../src +test "$VERBOSE" = yes && rm --version rm -r '' > /dev/null 2>&1 && fail=1 -- cgit v1.2.3-54-g00ecf