[SCM] GNU Libtool branch, master, updated. v2.4.6-23-g4985667

[Pavel Raiskup]

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  498566799618cba7d0e7b22140673f0582814054 (commit)
      from  a5c6466528c060cc4660ad0319c00740db0e42ba (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 498566799618cba7d0e7b22140673f0582814054
Author: Pavel Raiskup <prais...@redhat.com>
Date:   Wed Feb 3 10:05:51 2016 +0100

    gl-tests: dash && option-parser test fix
    
    Rico pointed out that the testsuite failed on his system (dash
    represented /bin/sh).  Turns out that 'shift' in dash exits shell
    with exit status 2 when there are no items in the array.
    
    The other issue was that 'test-option-parser.sh' did not
    re-executed the test in proper shell, but in /bin/sh.
    
    * gl/tests/test-option-parser-helper (test_parse_eat_test): Don't
    shift for empty $@.
    * gl/tests/test-option-parser.sh: Use $__GL_ALL_SHELLS_SHELL as
    shell which runs the helper.

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

Summary of changes:
 NO-THANKS                          |    1 +
 gl/tests/test-option-parser-helper |    9 ++++++---
 gl/tests/test-option-parser.sh     |    2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/NO-THANKS b/NO-THANKS
index 51ec8eb..8631c31 100644
--- a/NO-THANKS
+++ b/NO-THANKS
@@ -125,6 +125,7 @@ Peter Kjellerstedt          peter.kjellerst...@axis.com
 Pádraig Brady                 p...@draigbrady.com
 Richard B. Kreckel             krec...@ginac.de
 Richard Purdie                 rpur...@rpsys.net
+Rico Tzschichholz              ric...@ubuntu.com
 Robert Garron                  robert.gar...@access3000.net
 Robert Ögren                  li...@roboros.com
 Robert Yang                    liezhi.y...@windriver.com
diff --git a/gl/tests/test-option-parser-helper 
b/gl/tests/test-option-parser-helper
index d92747a..52ba668 100755
--- a/gl/tests/test-option-parser-helper
+++ b/gl/tests/test-option-parser-helper
@@ -119,10 +119,13 @@ test_parse_eat_test ()
     _G_opt=$1 ; shift
     case $_G_opt in
       --test|-t)
-        test $# = 0 && func_missing_arg $_G_opt
         _t_parse_match=:
-        opt_test=$1
-        shift
+        if test $# = 0; then
+          func_missing_arg $_G_opt
+        else
+          opt_test=$1
+          shift
+        fi
         ;;
     esac
 
diff --git a/gl/tests/test-option-parser.sh b/gl/tests/test-option-parser.sh
index 816dd03..43bef64 100755
--- a/gl/tests/test-option-parser.sh
+++ b/gl/tests/test-option-parser.sh
@@ -23,7 +23,7 @@ all_shells_script=$0
 
 . "$abs_aux_dir"/options-parser || exit 1
 
-helper=$abs_srcdir/test-option-parser-helper
+helper="$__GL_ALL_SHELLS_SHELL $abs_srcdir/test-option-parser-helper"
 
 check_output_inner ()
 {


hooks/post-receive
-- 
GNU Libtool