[SCM] GNU Libtool branch, master, updated. v2.2.6-50-g2258787

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Libtool".

The branch, master has been updated
       via  2258787e02552615a4a3a76c24c1cb5155a6cb5f (commit)
      from  c6d628415daaacc5b8a0176a1dc176cdd4dbdcc5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 2258787e02552615a4a3a76c24c1cb5155a6cb5f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Nov 23 22:35:58 2008 +0100

    Adjust executable run tests to cwrapper changes.
    
    * tests/testsuite.at (LT_AT_EXEC_CHECK): Accept fifth argument
    ARGS-OR-STATUS-ADJUST, for command-line arguments and/or exit
    status flattening.  Rewrite to prefer the executable with the
    `.exe' prefix over one without.  Test exit status against
    expected exit status, not against zero, when determining whether
    this may be a cross-compilation-induced result.
    (LT_AT_NOINST_EXEC_CHECK): Likewise.
    * tests/static.at (static linking flags for programs): Adjust
    calls.
    Report by Roumen Petrov.
    
    Signed-off-by: Ralf Wildenhues <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |   12 ++++++++++++
 tests/static.at    |    4 ++--
 tests/testsuite.at |   38 +++++++++++++++++++++++++++-----------
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 33fe805..263ffb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2008-11-23  Ralf Wildenhues  <address@hidden>
 
+       Adjust executable run tests to cwrapper changes.
+       * tests/testsuite.at (LT_AT_EXEC_CHECK): Accept fifth argument
+       ARGS-OR-STATUS-ADJUST, for command-line arguments and/or exit
+       status flattening.  Rewrite to prefer the executable with the
+       `.exe' prefix over one without.  Test exit status against
+       expected exit status, not against zero, when determining whether
+       this may be a cross-compilation-induced result.
+       (LT_AT_NOINST_EXEC_CHECK): Likewise.
+       * tests/static.at (static linking flags for programs): Adjust
+       calls.
+       Report by Roumen Petrov.
+
        No trailing period in Autotest test group names.
        * tests/link-order.at (Link order test): Drop trailing period
        from test name.
diff --git a/tests/static.at b/tests/static.at
index b5e9946..6c91b1f 100644
--- a/tests/static.at
+++ b/tests/static.at
@@ -194,11 +194,11 @@ func_test_exec_fail ()
     for st
     do
       echo "# m$st"
-      LT_AT_EXEC_CHECK([./m$st || (exit 1)], [1], [], [ignore])
+      LT_AT_EXEC_CHECK([./m$st], [1], [], [ignore], [|| (exit 1)])
       # For some per-deplib flag combinations there may be no installed 
program,
       # because liba2 is not yet installed.
       if test -f "$bindir/m$st"; then
-       LT_AT_EXEC_CHECK([$bindir/m$st || (exit 1)], [1], [], [ignore])
+       LT_AT_EXEC_CHECK([$bindir/m$st], [1], [], [ignore], [|| (exit 1)])
       fi
     done
   fi
diff --git a/tests/testsuite.at b/tests/testsuite.at
index f7e805e..9511c06 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -203,29 +203,45 @@ m4_define([_LT_AT_TRANSLATE_TEXT_OUTPUT],
 esac])
 
 
-# LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR])
+# LT_AT_EXEC_CHECK(EXECUTABLE, [STATUS = 0], [STDOUT], [STDERR],
+#                 [ARGS-OR-STATUS-ADJUST])
 # --------------------------------------------------------------
+# Run EXECUTABLE ARGS-OR-STATUS-ADJUST.  STATUS, STDOUT, and STDERR are
+# handled as in AT_CHECK, but expout and experr get line endings
+# translated.
+# However, if we are cross-compiling, then SKIP instead of FAIL.
+# ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
+# to unify different possible exit status values.
 m4_define([LT_AT_EXEC_CHECK],
 [m4_if([$3], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$3])])
 m4_if([$4], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])])
-AT_CHECK([$1; lt_status=$?; if test $lt_status -eq 0; then :;
-          elif test "X$host" != "X$build" && \
-               { test -x "$1" || test -x "$1"$EXEEXT; }
-          then (exit 77); else (exit $lt_status); fi],[$2],[$3],[$4])
+lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
+AT_CHECK([if "$lt_exe" $5; then :; else lt_status=$?; ]dnl
+        [  m4_ifval([$2], [test $lt_status != $2 && ])]dnl
+        [  test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
+        [  exit $lt_status; fi],[$2],[$3],[$4])
 ])
 
 
 # LT_AT_NOINST_EXEC_CHECK(EXECUTABLE, [NOINST-MODULES],
-#                        [STATUS = 0], [STDOUT], [STDERR])
+#                        [STATUS = 0], [STDOUT], [STDERR],
+#                        [ARGS-OR-STATUS-ADJUST])
 # ---------------------------------------------------------
+# Run EXECUTABLE ARGS-OR-STATUS-ADJUST using `libtool --mode=execute'
+# with `-dlopen' arguments in NOINST_MODULES.  STATUS, STDOUT, and
+# STDERR are handled as in AT_CHECK, but expout and experr get line
+# endings translated.
+# However, if we are cross-compiling, then SKIP instead of FAIL.
+# ARGS-OR-STATUS-ADJUST can also contain code like `|| (exit 1)'
+# to unify different possible exit status values.
 m4_define([LT_AT_NOINST_EXEC_CHECK],
 [m4_if([$4], [expout], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$4])])
 m4_if([$5], [experr], [_LT_AT_TRANSLATE_TEXT_OUTPUT([$5])])
-AT_CHECK([$LIBTOOL --mode=execute $2 $1; lt_status=$?;
-          if test $lt_status -eq 0; then :;
-          elif test "X$host" != "X$build" && \
-               { test -x "$1" || test -x "$1"$EXEEXT; }
-          then (exit 77); else (exit $lt_status); fi],[$3],[$4],[$5])
+lt_exe=$1; if test -f "$1$EXEEXT"; then lt_exe=$lt_exe$EXEEXT; fi
+AT_CHECK([if $LIBTOOL --mode=execute $2 "$lt_exe" $6; then :; else 
lt_status=$?; ]dnl
+        [  m4_ifval([$2], [test $lt_status != $2 && ])]dnl
+        [  test "X$host" != "X$build" && test -x "$lt_exe" && exit 77; ]dnl
+        [  exit $lt_status; fi],[$3],[$4],[$5])
 ])
 
 


hooks/post-receive
--
GNU Libtool