From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 3 Aug 2010 20:27:23 +0000 (+0200)
Subject: Fix testsuite errors due to shell quoted parameter expansion issue.
X-Git-Tag: v2.4~101
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=06543b43736a9d36c447e7fa04b76d90a6b31967;p=thirdparty%2Flibtool.git

Fix testsuite errors due to shell quoted parameter expansion issue.

* tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Insert space
between double-quoted and unquoted shell parameter, as bash
4.0.28 doesn't add one in its output if the expansion of the
second one starts with a space.
(short option splitting, enhanced shell short option splitting)
(long option splitting, XSI long option splitting): Add space in
expected output.
Fixes testsuite failures on AIX, FreeBSD, etc.
Report by Rainer Tammer.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index f8a2fc729..49efb7b74 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-08-04  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix testsuite errors due to shell quoted parameter expansion issue.
+	* tests/getopt-m4sh.at (_LT_AT_GETOPT_M4SH_SETUP): Insert space
+	between double-quoted and unquoted shell parameter, as bash
+	4.0.28 doesn't add one in its output if the expansion of the
+	second one starts with a space.
+	(short option splitting, enhanced shell short option splitting)
+	(long option splitting, XSI long option splitting): Add space in
+	expected output.
+	Fixes testsuite failures on AIX, FreeBSD, etc.
+	Report by Rainer Tammer.
+
 2010-08-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix build failure with AIX sh due to shell quoting error.
diff --git a/tests/getopt-m4sh.at b/tests/getopt-m4sh.at
index ca5d5b8e6..768d59543 100644
--- a/tests/getopt-m4sh.at
+++ b/tests/getopt-m4sh.at
@@ -44,7 +44,7 @@ M4SH_GETOPTS(
   [i],	[--install],	[],	[options="$options install"],
   [v],	[--verbose],	[],	[options="$options verbose"],
   [!],	[--ltdl],	[false],[options="$options ltdl=$optarg"],
-[echo "$list"$options])
+[echo "$list" $options])
 ]])
 m4_pattern_forbid([m4_include])
 m4_pattern_forbid([AS_INIT])
@@ -87,7 +87,7 @@ rm -f options && mv options.tmp options])
 AT_SETUP([short option splitting])
 
 AT_DATA(expout,
-[[force verbose install
+[[ force verbose install
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
@@ -103,7 +103,7 @@ AT_SETUP([enhanced shell short option splitting])
 AT_CHECK([fgrep '# Extended-shell func_split_short_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
 
 AT_DATA(expout,
-[[force verbose install
+[[ force verbose install
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
@@ -121,7 +121,7 @@ AT_CLEANUP
 AT_SETUP([long option splitting])
 
 AT_DATA(expout,
-[[ltdl=long
+[[ ltdl=long
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP
@@ -137,7 +137,7 @@ AT_SETUP([XSI long option splitting])
 AT_CHECK([fgrep '# Extended-shell func_split_long_opt' $abs_top_builddir/libtool >/dev/null 2>&1 || (exit 77)])
 
 AT_DATA(expout,
-[[ltdl=long
+[[ ltdl=long
 ]])
 
 _LT_AT_GETOPT_M4SH_SETUP