From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 16 Nov 2008 17:29:34 +0000 (+0100)
Subject: Fix execute mode test to actually expose cwrapper failures.
X-Git-Tag: v2.2.7b~175
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b7109dab7251a5f3608c68830f63cab97b58ff04;p=thirdparty%2Flibtool.git

Fix execute mode test to actually expose cwrapper failures.

* tests/execute-mode.at (execute mode): Actually also test the
cwrapper on the arguments.
Report by Bruno Haible.

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

diff --git a/ChangeLog b/ChangeLog
index 7e49432d8..aff79eb84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix execute mode test to actually expose cwrapper failures.
+	* tests/execute-mode.at (execute mode): Actually also test the
+	cwrapper on the arguments.
+	Report by Bruno Haible.
+
 2008-11-15  Charles Wilson  <libtool@cwilson.fastmail.fm>
 
 	Add func_win32_import_lib_p.
diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index acbe0810f..a019e8e41 100644
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -119,7 +119,7 @@ AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o liba.la -rpath $libdir li
 	 [], [ignore], [ignore])
 AT_CHECK([$CC $CPPFLAGS $CFLAGS -c main.c],
 	 [], [ignore], [ignore])
-AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main main.$OBJEXT liba.la],
+AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS -o main$EXEEXT main.$OBJEXT liba.la],
 	 [], [ignore], [ignore])
 
 # end of preparatory blurb.
@@ -168,6 +168,9 @@ AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper "arg  with special chars: \$!
 	 [], [./lt-real
 arg  with special chars: $!&*`'()
 ])
+AT_CHECK([$LIBTOOL --mode=execute ./main$EXEEXT "arg  with special chars: \$!&*\`'()"],
+	 [], [stdout])
+AT_CHECK([$FGREP 'arg  with special chars: $!&*`'\''()' stdout], [], [ignore])
 
 # We always pair two args.  The first one is never the empty string.
 arg1=
@@ -199,6 +202,11 @@ do
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
   AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
+  AT_CHECK([$LIBTOOL --mode=execute ./main$EXEEXT abc "$arg1" "$arg2" xyz], [], [stdout])
+  AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
+  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  # Do not match EOL here, cross setups may have an extra \r here.
+  AT_CHECK([test `sed -n '/^abc/,/^xyz/p' stdout | wc -l` -eq 4])
   arg1=
 done