init.sh: accommodate even those who specify bogus srcdir manually

* tests/init.sh: Normally, srcdir is guaranteed by automake and
configure-time tests to be sanitized, so that there is no need to
use "$srcdir" in Makefile rules and shell scripts.  Using $srcdir
(with no double quotes) suffices.  However, since tests may be
invoked manually, and since you may explicitly set srcdir to the
name of a directory containing spaces, do quote its uses here.
* tests/test-pread.sh: Likewise.
Suggested by Bruno Haible.

diff --git a/ChangeLog b/ChangeLog
index bcb43400b751724288123ab2435ec57772afb1a2..dacf782012b2fb570c0a02e8d1aec9254d8ce856 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
 2009-11-26  Jim Meyering  <meyering@redhat.com>
 
+       init.sh: accommodate even those who specify bogus srcdir manually
+       * tests/init.sh: Normally, srcdir is guaranteed by automake and
+       configure-time tests to be sanitized, so that there is no need to
+       use "$srcdir" in Makefile rules and shell scripts.  Using $srcdir
+       (with no double quotes) suffices.  However, since tests may be
+       invoked manually, and since you may explicitly set srcdir to the
+       name of a directory containing spaces, do quote its uses here.
+       * tests/test-pread.sh: Likewise.
+       Suggested by Bruno Haible.
+
        test-pread.sh: avoid diagnostics for those who ignore SIGPIPE
        * tests/test-pread.sh: Write no data into the pipe, because
        test-pread actually reads none.  This avoids a diagnostic,

diff --git a/tests/init.sh b/tests/init.sh
index 7d4879f93880101eaade926efac8881f75320806..db2fa76c991bc7073369ee8aadc86cf6b12e5e93 100644 (file)
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -210,7 +210,7 @@ mktempd_()
 
 # If you want to override the testdir_prefix_ function,
 # or to add more utility functions, use this file.
-test -f $srcdir/init.cfg \
-  && . $srcdir/init.cfg
+test -f "$srcdir/init.cfg" \
+  && . "$srcdir/init.cfg"
 
 setup_ "$@"

diff --git a/tests/test-pread.sh b/tests/test-pread.sh
index d7824ad1b101bab7cef52f8dd74204418e31efa8..59f8536c7d3015ce84b7be40afe748c265562c05 100755 (executable)
--- a/tests/test-pread.sh
+++ b/tests/test-pread.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 : ${srcdir=.}
-. $srcdir/init.sh --set-path=.
+. "$srcdir/init.sh" --set-path=.
 
 fail=0
 : | test-pread || fail=1