* tests/defs.m4sh (func_exec): `shift'ing when there is nothing

to shift is non-portable.

diff --git a/ChangeLog b/ChangeLog
index f0a9fd8caeffc4e239d7e16d91df6d322118f6aa..b4cec579aaba83d09c0d7ec5d3f0f2afc0c618ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-30  Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+       * tests/defs.m4sh (func_exec): `shift'ing when there is nothing
+       to shift is non-portable.
+
 2004-10-28  Patrick Welche <prlw1@newn.cam.ac.uk>,
            Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
 

diff --git a/tests/defs.m4sh b/tests/defs.m4sh
index 494415a625851d6a3a31d81b20e958108ee05749..e3b154df91d5f72f462348aa534f9f3ccdc41a5f 100644 (file)
--- a/tests/defs.m4sh
+++ b/tests/defs.m4sh
@@ -284,7 +284,8 @@ func_exec ()
 
     if eval $my_program $my_exp_output; then :
     else
-      shift; shift
+      shift
+      test "x$1" = x || shift
       func_error "$0: cannot execute $my_program ${1+$@}"
 
       # Simple check to see if they are superuser.