tests: convert remaining uses of test-lib.sh to init.sh

RHS='. "\${srcdir=.}/init.sh"; path_prepend_ ../src'
git grep -l test-lib.sh \
  | xargs perl -pi -e 's,^\. \$srcdir/test-lib\.sh$,'"$RHS",

19 files changed, 19 insertions, 19 deletions

diff --git a/tests/misc/arch b/tests/misc/arch
index a4475e6d0..462919f57 100755
--- a/tests/misc/arch
+++ b/tests/misc/arch
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && arch --version
 
 require_built_ arch
diff --git a/tests/misc/env-null b/tests/misc/env-null
index ed2e21d58..c08856c01 100755
--- a/tests/misc/env-null
+++ b/tests/misc/env-null
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && { env --version; env -- printenv --version; }
 
 # POSIX is clear that environ may, but need not be, sorted.
diff --git a/tests/misc/md5sum-parallel b/tests/misc/md5sum-parallel
index 6f38b8b1b..fdbc4c202 100755
--- a/tests/misc/md5sum-parallel
+++ b/tests/misc/md5sum-parallel
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && md5sum --version
 
 (mkdir tmp && cd tmp && seq 500 | xargs touch)
diff --git a/tests/misc/printenv b/tests/misc/printenv
index dd82c0509..67173ed58 100755
--- a/tests/misc/printenv
+++ b/tests/misc/printenv
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- printenv --version
 
 # Without arguments, printenv behaves like env.  Some shells provide
diff --git a/tests/misc/printf b/tests/misc/printf
index cf376f3ba..b0fe19cdb 100755
--- a/tests/misc/printf
+++ b/tests/misc/printf
@@ -18,7 +18,7 @@
 
 prog="$abs_top_builddir/src/printf"
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- printf --version
 
 getlimits_
diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex
index 39b70d6ef..864dc0bb2 100755
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- printf --version
 
 env printf '\x7e3\n' > out || fail=1
diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise
index 702ab67a3..53f46b58f 100755
--- a/tests/misc/printf-surprise
+++ b/tests/misc/printf-surprise
@@ -18,7 +18,7 @@
 
 prog=printf
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- printf --version
 
 require_ulimit_
diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long
index c58207abe..b3d14c6ca 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -20,7 +20,7 @@
 : ${srcdir=.}
 . $srcdir/require-perl
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- pwd --version
 
 require_readable_root_
diff --git a/tests/misc/pwd-option b/tests/misc/pwd-option
index e4ecf11f9..e01026674 100755
--- a/tests/misc/pwd-option
+++ b/tests/misc/pwd-option
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && env -- pwd --version
 
 mkdir -p a/b || framework_failure
diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent
index 1f3d914eb..b24a97c89 100755
--- a/tests/misc/pwd-unreadable-parent
+++ b/tests/misc/pwd-unreadable-parent
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && { env -- pwd --version; readlink --version; }
 
 test $host_os != linux-gnu &&
diff --git a/tests/misc/selinux b/tests/misc/selinux
index 0a8259fef..0d798c1d2 100755
--- a/tests/misc/selinux
+++ b/tests/misc/selinux
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && for i in chcon cp ls mv stat; do $i --version; done
 
 require_root_
diff --git a/tests/misc/stdbuf b/tests/misc/stdbuf
index 8302c4896..4a694c7cd 100755
--- a/tests/misc/stdbuf
+++ b/tests/misc/stdbuf
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && { stdbuf --version; mv --version; }
 
 getlimits_
diff --git a/tests/misc/stty b/tests/misc/stty
index 0659d51a5..cc1d933a3 100755
--- a/tests/misc/stty
+++ b/tests/misc/stty
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Make sure there's a tty on stdin.
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && stty --version
 
 require_controlling_input_terminal_
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index 5acb3d0bb..ed7fede97 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -28,7 +28,7 @@ export COLUMNS
 LC_ALL=C
 export LC_ALL
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && stty --version
 
 require_controlling_input_terminal_
diff --git a/tests/misc/su-fail b/tests/misc/su-fail
index 4c57c945b..e8a0c5ff5 100755
--- a/tests/misc/su-fail
+++ b/tests/misc/su-fail
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && su --version
 
 require_built_ su
diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv
index 705de2766..5465f213a 100755
--- a/tests/misc/sum-sysv
+++ b/tests/misc/sum-sysv
@@ -25,7 +25,7 @@
 LC_ALL=C
 export LC_ALL
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && sum --version
 
 # FYI, 16843009 is floor (2^32 / 255).
diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other
index 86fd5288e..88aa63cbe 100755
--- a/tests/misc/truncate-owned-by-other
+++ b/tests/misc/truncate-owned-by-other
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && truncate --version
 
 require_root_
diff --git a/tests/misc/wc-parallel b/tests/misc/wc-parallel
index 47f10441c..fd809f5f2 100755
--- a/tests/misc/wc-parallel
+++ b/tests/misc/wc-parallel
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && md5sum --version
 
 (mkdir tmp && cd tmp && seq 2000 | xargs touch)
diff --git a/tests/misc/xattr b/tests/misc/xattr
index 3a27f15e0..13e0857a5 100755
--- a/tests/misc/xattr
+++ b/tests/misc/xattr
@@ -18,7 +18,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-. $srcdir/test-lib.sh
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
 test "$VERBOSE" = yes && { cp --version; mv --version; ginstall --version; }
 
 # Skip this test if cp was built without xattr support: