From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 11 Nov 2007 17:55:24 +0000 (+0100)
Subject: Ignore configure --help* errors due to LINENO-impaired shells.
X-Git-Tag: v2.62~152
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00865ec8426eed430d9a36c906d6ce7d307f8cf1;p=thirdparty%2Fautoconf.git

Ignore configure --help* errors due to LINENO-impaired shells.

* tests/torture.at (Configuring subdirectories, Deep Package):
In the --help* tests in read-only trees, make `.' temporarily
writable again for the `stderr' file, and ignore errors due to
the attempt to write configure.lineno.
Report by Patrick Welche.
---

diff --git a/ChangeLog b/ChangeLog
index aaf50a85..69e6990f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Ignore configure --help* errors due to LINENO-impaired shells.
+	* tests/torture.at (Configuring subdirectories, Deep Package):
+	In the --help* tests in read-only trees, make `.' temporarily
+	writable again for the `stderr' file, and ignore errors due to
+	the attempt to write configure.lineno.
+	Report by Patrick Welche.
+
 2007-11-10  Jim Meyering  <meyering@redhat.com>
 
 	Generate package.m4 in build-dir, not srcdir.
diff --git a/tests/torture.at b/tests/torture.at
index 354deee2..63d6ef94 100644
--- a/tests/torture.at
+++ b/tests/torture.at
@@ -1059,7 +1059,9 @@ AT_CHECK([test -f inner/configure])
 # Running the outer configure recursively should provide the innermost
 # help strings.
 chmod a-w inner/innermost inner .
-AT_CHECK([./configure --help=recursive | grep INNER], 0, [ignore])
+AT_CHECK([{ ./configure --help=recursive; chmod u+w .; } | grep INNER], 0,
+	 [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
 chmod u+w . inner inner/innermost
 
 # Running the outer configure should trigger the inner.
@@ -1163,11 +1165,25 @@ AT_CHECK([test -f inner/innermost/config.hin])
 # Running the outer configure recursively should provide the innermost
 # help strings.
 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; export PATH; /bin/sh configure --help=recursive | grep " INNERMOST "], 0, [ignore])
-AT_CHECK([PATH=.$PATH_SEPARATOR$PATH; export PATH; configure --help=recursive | grep " INNERMOST "], 0, [ignore])
+AT_CHECK([{ ./configure --help=recursive; chmod u+w .; } | grep " INNER "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w .
+AT_CHECK([{ ./configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w .
+AT_CHECK([{ /bin/sh ./configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w .
+AT_CHECK([PATH=.$PATH_SEPARATOR$PATH; export PATH; { /bin/sh configure --help=recursive; chmod +w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w .
+AT_CHECK([PATH=.$PATH_SEPARATOR$PATH; export PATH; { configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
 chmod u+w inner inner/innermost
 
 # Running the outer configure should trigger the inner.
@@ -1179,14 +1195,25 @@ AT_CHECK([grep INNERMOST inner/innermost/config.h], 0,
 # The same, but from a builddir.
 AS_MKDIR_P([builddir])
 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 && { ../configure --help=recursive; chmod u+w .; } | grep " INNER "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w builddir
+AT_CHECK([cd builddir && { ../configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w builddir
+AT_CHECK([cd builddir && { /bin/sh ../configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
+chmod a-w builddir
 # 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])
+AT_CHECK([PATH=`pwd`$PATH_SEPARATOR$PATH; export PATH; cd builddir && { configure --help=recursive; chmod u+w .; } | grep " INNERMOST "],
+	 0, [ignore], [stderr],
+	 [AT_CHECK([grep 'rerun with a POSIX shell' stderr], [], [ignore])])
 chmod u+w builddir inner inner/innermost
 AT_CHECK([cd builddir && ../configure INNERMOST=build/tsomrenni], 0, [ignore])
 AT_CHECK([grep INNERMOST builddir/inner/innermost/config.h], 0,