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,"

6 files changed, 12 insertions, 36 deletions

diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 19e9602ca..7d6716624 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 
 
diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref
index b4ea299f8..77d3bcbcb 100755
--- a/tests/chgrp/default-no-deref
+++ b/tests/chgrp/default-no-deref
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 
 set _ $groups; shift
diff --git a/tests/chgrp/deref b/tests/chgrp/deref
index 36a320be0..e3cfed229 100755
--- a/tests/chgrp/deref
+++ b/tests/chgrp/deref
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 
 set _ $groups; shift
diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x
index a8e49cddb..e3a4aefd0 100755
--- a/tests/chgrp/no-x
+++ b/tests/chgrp/no-x
@@ -17,12 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 skip_if_root_
 
diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H
index db0b07796..6cf101c8f 100755
--- a/tests/chgrp/posix-H
+++ b/tests/chgrp/posix-H
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 
 set _ $groups; shift
diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse
index 8fd53da4d..0f7f00f22 100755
--- a/tests/chgrp/recurse
+++ b/tests/chgrp/recurse
@@ -16,12 +16,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-if test "$VERBOSE" = yes; then
-  set -x
-  chgrp --version
-fi
-
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+test "$VERBOSE" = yes && chgrp --version
 require_membership_in_two_groups_
 
 set _ $groups; shift