From 39874879f2ebf3973d331d0d189a15c0652e5e4f Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 1 Nov 2004 11:10:14 +0000
Subject: [PATCH] * tests/defs.m4sh (func_exec): `shift'ing when there is
 nothing to shift is non-portable.

---
 ChangeLog       | 5 +++++
 tests/defs.m4sh | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index f0a9fd8ca..b4cec579a 100644
--- 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 494415a62..e3b154df9 100644
--- 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.
-- 
2.47.2