-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
According to Ralf Wildenhues on 10/18/2008 2:44 AM:
> The issue in the m4sh scripts is that the ':' contents end up outside
> the function definition. I'm sure you'll have that fixed in a blink of
> an eye. ;-)
62 and 63 are easy to point to the commit that caused the regression:
29f8f14a added a new parameter to AS_REQUIRE_SHELL_FN, but I forgot to
update the testsuite (shame on me for not testing more thoroughly). I'm
not sure about the others, just yet. But I'm checking this in now:
- --
Don't work too hard, make some time for fun as well!
Eric Blake [EMAIL PROTECTED]
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Public key at home.comcast.net/~ericblake/eblake.gpg
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iEYEARECAAYFAkj522MACgkQ84KuGfSFAYAICACdG0T1WCT2M2kpZ2II3PzNsYWZ
PqEAoIxNtdPs1vg2gULF+U0tzuL5pZ+L
=3QQV
-----END PGP SIGNATURE-----
>From 2d36d623389865deea67a8ded9963779cc397c2e Mon Sep 17 00:00:00 2001
From: Eric Blake <[EMAIL PROTECTED]>
Date: Sat, 18 Oct 2008 06:48:55 -0600
Subject: [PATCH] Fix some testsuite failures introduced two days ago.
* tests/m4sh.at (Nested AS@&[EMAIL PROTECTED])
(AS@&[EMAIL PROTECTED] and m4@&[EMAIL PROTECTED]): Adjust to changed
API.
Reported by Ralf Wildenhues.
Signed-off-by: Eric Blake <[EMAIL PROTECTED]>
---
ChangeLog | 8 ++++++++
tests/m4sh.at | 6 +++---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 79100bc..300056e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-18 Eric Blake <[EMAIL PROTECTED]>
+
+ Fix some testsuite failures introduced two days ago.
+ * tests/m4sh.at (Nested AS@&[EMAIL PROTECTED])
+ (AS@&[EMAIL PROTECTED] and m4@&[EMAIL PROTECTED]): Adjust to changed
+ API.
+ Reported by Ralf Wildenhues.
+
2008-10-17 Eric Blake <[EMAIL PROTECTED]>
Add m4_curry.
diff --git a/tests/m4sh.at b/tests/m4sh.at
index 73438fb..c39c8c1 100644
--- a/tests/m4sh.at
+++ b/tests/m4sh.at
@@ -522,11 +522,11 @@ m4_defun([TEST_FUNC2_BODY], [
])
m4_defun([TEST_FUNC1_BODY], [
-AS_REQUIRE_SHELL_FN([test_func2], [TEST_FUNC2_BODY])
+AS_REQUIRE_SHELL_FN([test_func2], [], [TEST_FUNC2_BODY])
:
])
-AS_REQUIRE_SHELL_FN([test_func1], [TEST_FUNC1_BODY])
+AS_REQUIRE_SHELL_FN([test_func1], [], [TEST_FUNC1_BODY])
test_func2
]])
@@ -566,7 +566,7 @@ m4_require([error_if_emitted_in_m4sh_init])
m4_defun([test_init], [
AS_REQUIRE([in_m4_sh_init], , [M4SH-INIT-FN])
-AS_REQUIRE_SHELL_FN([test_func], [TEST_FUNC_BODY])
+AS_REQUIRE_SHELL_FN([test_func], [], [TEST_FUNC_BODY])
AS_REQUIRE([not_in_m4_sh_init])
])
--
1.6.0.2
