From bfda4ae748eed95f5fdf4374e6c1ebd80353892b Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@gnu.org>
Date: Mon, 10 Nov 2003 19:22:19 +0000
Subject: [PATCH] * tests/defs.in: Export SHELL. * tests/cond11.test: Missing
 quotes. * tests/nogzip2.test: Require bzip2.

---
 ChangeLog         | 6 ++++++
 tests/cond11.test | 2 +-
 tests/defs.in     | 2 ++
 tests/nogzip.test | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index aad0ebce7..58d0c754a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-10  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	* tests/defs.in: Export SHELL.
+	* tests/cond11.test: Missing quotes.
+	* tests/nogzip2.test: Require bzip2.
+
 2003-11-09  Alexandre Duret-Lutz  <adl@gnu.org>
 
 	* NEWS: Add news entries from 1.6.x and 1.7.x.
diff --git a/tests/cond11.test b/tests/cond11.test
index 584538cbc..fbcc14166 100755
--- a/tests/cond11.test
+++ b/tests/cond11.test
@@ -28,7 +28,7 @@ set -e
 
 cat >> configure.in << 'END'
 AC_PROG_CC
-AM_CONDITIONAL([USE_A], [test -z $two])
+AM_CONDITIONAL([USE_A], [test -z "$two"])
 AC_SUBST([SUBSTVAR], [bar])
 AC_OUTPUT
 END
diff --git a/tests/defs.in b/tests/defs.in
index e155e25d4..9cdc9664a 100644
--- a/tests/defs.in
+++ b/tests/defs.in
@@ -62,7 +62,9 @@ test -z "$VERBOSE" && {
    exec > /dev/null 2>&1
 }
 
+# Make sure we override the user shell.
 SHELL='@SHELL@'
+export SHELL
 # User can override various tools used.
 test -z "$PERL" && PERL='@PERL@'
 test -z "$MAKE" && MAKE=make
diff --git a/tests/nogzip.test b/tests/nogzip.test
index 955f836b2..58b4d09de 100755
--- a/tests/nogzip.test
+++ b/tests/nogzip.test
@@ -20,6 +20,7 @@
 
 # Check support for no-dist-gzip
 
+required=bzip2
 . ./defs || exit 1
 
 set -e
-- 
2.47.2