Fix execute mode test for OSF/1 5.1.

* tests/execute-mode.at (execute mode): Do not use grep -F
with an empty pattern.
* THANKS: Update.
Report by Jay K.

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

diff --git a/ChangeLog b/ChangeLog
index feffb964b54af34671664aa94c1d5047a0c2ec2d..d9ae5464ce5cad2db4f6822e61a253c73df904bc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2010-06-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix execute mode test for OSF/1 5.1.
+       * tests/execute-mode.at (execute mode): Do not use grep -F
+       with an empty pattern.
+       * THANKS: Update.
+       Report by Jay K.
+
        Use config.cache variable for PIC flag, to allow override.
        * libltdl/m4/libtool.m4 (_LT_COMPILER_PIC) <lt_prog_compiler_pic>:
        Save result, and allow override, through cache variable

diff --git a/THANKS b/THANKS
index 46fd88a4708207c03eb722dd273c79a729b9575b..405a4f7e9da36d4e9432d6197e2ab366422ca2cb 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -106,6 +106,7 @@
   Jakub Bogusz                 qboosh@pld-linux.org
   Jacob Meuser                 jakemsr@jakemsr.com
   James Su                     james.su@gmail.com
+  Jay K                                jay.krell@cornell.edu
   Jeff Squyres                 jsquyres@lam-mpi.org
   Jeremy C. Reed               reed@reedmedia.net
   Jim Meyering                 jim@meyering.net

diff --git a/tests/execute-mode.at b/tests/execute-mode.at
index a1a1ee286ac00001fce0bf0e1a4307632404f7b2..55f776c5dd0eede709bbf46b6c712d935d9f8d03 100644 (file)
--- a/tests/execute-mode.at
+++ b/tests/execute-mode.at
@@ -1,6 +1,6 @@
 # execute-mode.at -- libtool --mode=execute             -*- Autotest -*-
 #
-#   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+#   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
 #   Written by Ralf Wildenhues, 2008
 #
 #   This file is part of GNU Libtool.
@@ -193,19 +193,19 @@ do
   fi
   AT_CHECK([$LIBTOOL --mode=execute ./foo abc "$arg1" "$arg2" xyz], [], [stdout], [ignore])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./lt-wrapper abc "$arg1" "$arg2" xyz </dev/null], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $FGREP "$arg2" stdout], [], [ignore])
   AT_CHECK([test `sed -n '/^abc$/,/^xyz$/p' stdout | wc -l` -eq 4])
   AT_CHECK([$LIBTOOL --mode=execute ./foo lt-wrapper abc "$arg1" "$arg2" xyz], [], [stdout])
   AT_CHECK([$FGREP "$arg1" stdout], [], [ignore])
-  AT_CHECK([$FGREP "$arg2" stdout], [], [ignore])
+  AT_CHECK([test -z "$arg2" || $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])
+  AT_CHECK([test -z "$arg2" || $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=