From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 21 Oct 2007 18:15:38 +0000 (+0200)
Subject: Fix `Deep Package' test failure on FreeBSD.
X-Git-Tag: v2.62~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ccb2448888210a9dc15605edd076f44a4a4242a;p=thirdparty%2Fautoconf.git

Fix `Deep Package' test failure on FreeBSD.

* tests/torture.at (Deep Package): Do not add `.' to $PATH
unnecessarily.  Do not try running `/bin/sh configure' with a
configure script to be found in $PATH, if the shell does not do
this resolution.  Fixes test failure on FreeBSD.
---

diff --git a/ChangeLog b/ChangeLog
index f07684e6..a264d39a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-10-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Fix `Deep Package' test failure on FreeBSD.
+	* tests/torture.at (Deep Package): Do not add `.' to $PATH
+	unnecessarily.  Do not try running `/bin/sh configure' with a
+	configure script to be found in $PATH, if the shell does not do
+	this resolution.  Fixes test failure on FreeBSD.
+
 	Fix config header generation with AIX awk.
 	* lib/autoconf/status.m4 (_AC_OUTPUT_HEADERS_PREPARE): In awk
 	script, use helper array D_is_set, as `" 0"' does not evaluate
diff --git a/tests/torture.at b/tests/torture.at
index 0a835ba2..4ffaafb0 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1160,7 +1160,7 @@ chmod a-w inner/innermost inner
 AT_CHECK([./configure --help=recursive | grep " INNER "],     0, [ignore])
 AT_CHECK([./configure --help=recursive | grep " INNERMOST "], 0, [ignore])
 AT_CHECK([/bin/sh ./configure --help=recursive | grep " INNERMOST "], 0, [ignore])
-AT_CHECK([PATH=.$PATH_SEPARATOR$PATH /bin/sh configure --help=recursive | grep " INNERMOST "], 0, [ignore])
+AT_CHECK([/bin/sh configure --help=recursive | grep " INNERMOST "], 0, [ignore])
 AT_CHECK([PATH=.$PATH_SEPARATOR$PATH; export PATH; configure --help=recursive | grep " INNERMOST "], 0, [ignore])
 chmod u+w inner inner/innermost
 
@@ -1176,7 +1176,10 @@ chmod a-w builddir inner/innermost inner
 AT_CHECK([cd builddir && ../configure --help=recursive | grep " INNER "],     0, [ignore])
 AT_CHECK([cd builddir && ../configure --help=recursive | grep " INNERMOST "], 0, [ignore])
 AT_CHECK([cd builddir && /bin/sh ../configure --help=recursive | grep " INNERMOST "], 0, [ignore])
-AT_CHECK([cd builddir && PATH=`pwd`/..$PATH_SEPARATOR$PATH /bin/sh configure --help=recursive | grep " INNERMOST "], 0, [ignore])
+# Not all shells search $PATH for scripts.
+if (cd builddir && PATH=`pwd`/..$PATH_SEPARATOR$PATH /bin/sh configure --help) >/dev/null 2>&1; then
+  AT_CHECK([cd builddir && PATH=`pwd`/..$PATH_SEPARATOR$PATH /bin/sh configure --help=recursive | grep " INNERMOST "], 0, [ignore])
+fi
 AT_CHECK([PATH=`pwd`$PATH_SEPARATOR$PATH; export PATH; cd builddir && configure --help=recursive | grep " INNERMOST "], 0, [ignore])
 chmod u+w builddir inner inner/innermost
 AT_CHECK([cd builddir && ../configure INNERMOST=build/tsomrenni], 0, [ignore])