From f38becab02472e6872048a1951b249b2a3c054df Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
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/r-3 | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'tests/rm/r-3')

diff --git a/tests/rm/r-3 b/tests/rm/r-3
index 3d944f6a9..829685055 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -23,12 +23,8 @@
 # And the rm from coreutils-5.0 exposes the same problem when there
 # are 338 or more files in a directory on a Darwin-6.5 system
 
-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
 
 mkdir t || framework_failure
 cd t || framework_failure
-- 
cgit v1.2.3-54-g00ecf