maint: make our use of gnulib's init.sh conform

* tests/help-version: Make use of init.sh conform.
* tests/helin-segv: Likewise.
* tests/help-version: Likewise.
* tests/hufts: Likewise.
* tests/memcpy-abuse: Likewise.
* tests/mixed: Likewise.
* tests/null-suffix-clobber: Likewise.
* tests/stdin: Likewise.
* tests/trailing-nul: Likewise.
* tests/zdiff: Likewise.
* tests/zgrep-f: Likewise.
* tests/zgrep-signal: Likewise.
* tests/znew-k: Likewise.

12 files changed, 12 insertions, 24 deletions

diff --git a/tests/helin-segv b/tests/helin-segv
index d0f8567..ed0ebfa 100755
--- a/tests/helin-segv
+++ b/tests/helin-segv
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 # This test case was provided by Aki Helin.
 printf '\037\235\220\0\0\0\304' > helin.gz || framework_failure_
diff --git a/tests/help-version b/tests/help-version
index 5d73f5d..9fb3127 100755
--- a/tests/help-version
+++ b/tests/help-version
@@ -23,8 +23,7 @@
 test "x$SHELL" = x && SHELL=/bin/sh
 export SHELL
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 expected_failure_status_chroot=125
 expected_failure_status_env=125
diff --git a/tests/hufts b/tests/hufts
index dc895af..ac0dc8e 100755
--- a/tests/hufts
+++ b/tests/hufts
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 printf '\n...: invalid compressed data--format violated\n' > exp \
   || framework_failure_
diff --git a/tests/memcpy-abuse b/tests/memcpy-abuse
index 5d2256a..601ac3d 100755
--- a/tests/memcpy-abuse
+++ b/tests/memcpy-abuse
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 # The input must be larger than 32KiB and slightly
 # less uniform than e.g., all zeros.
diff --git a/tests/mixed b/tests/mixed
index c3775c8..7a0973b 100644
--- a/tests/mixed
+++ b/tests/mixed
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 printf 'xxx\nyyy\n'      > exp2 || framework_failure_
 printf 'aaa\nbbb\nccc\n' > exp3 || framework_failure_
diff --git a/tests/null-suffix-clobber b/tests/null-suffix-clobber
index 36cd9b4..0fa7191 100755
--- a/tests/null-suffix-clobber
+++ b/tests/null-suffix-clobber
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 printf anything | gzip > F.gz || framework_failure_
 echo y > yes || framework_failure_
diff --git a/tests/stdin b/tests/stdin
index c7459c6..2f41a8c 100755
--- a/tests/stdin
+++ b/tests/stdin
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 printf a | gzip > in || framework_failure_
 printf aaa > exp || framework_failure_
diff --git a/tests/trailing-nul b/tests/trailing-nul
index 63bae48..ac44794 100755
--- a/tests/trailing-nul
+++ b/tests/trailing-nul
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 (echo 0 | gzip; printf '\0') > 0.gz || framework_failure_
 (echo 00 | gzip; printf '\0\0') > 00.gz || framework_failure_
diff --git a/tests/zdiff b/tests/zdiff
index 505b93f..b4e6f02 100755
--- a/tests/zdiff
+++ b/tests/zdiff
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 echo a > a || framework_failure_
 echo b > b || framework_failure_
diff --git a/tests/zgrep-f b/tests/zgrep-f
index cf4b602..ba76bfd 100644
--- a/tests/zgrep-f
+++ b/tests/zgrep-f
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 require_POSIX_grep_
 
diff --git a/tests/zgrep-signal b/tests/zgrep-signal
index d861a01..d9d3ff2 100644
--- a/tests/zgrep-signal
+++ b/tests/zgrep-signal
@@ -18,8 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 echo a | gzip -c > f.gz || framework_failure_
 
diff --git a/tests/znew-k b/tests/znew-k
index e7ca443..67bb82e 100644
--- a/tests/znew-k
+++ b/tests/znew-k
@@ -17,8 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # limit so don't run it by default.
 
-: ${srcdir=.}
-. "$srcdir/init.sh"; path_prepend_ ..
+. "${srcdir=.}/init.sh"; path_prepend_ ..
 
 cat <<'EOF' >compress || framework_failure_
 #!/bin/sh