add limited support for format builtin in gnu-m4 mode, because I'm fed

up of patching it away in various autoconf derivatives.

okay miod@

3 files changed, 8 insertions, 2 deletions

diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index 6b89ec7a220..b0d32a25ac8 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.22 2005/09/06 15:33:21 espie Exp $
+#	$OpenBSD: Makefile,v 1.23 2006/03/20 20:27:45 espie Exp $
 
 FIBOMAX=25
 M4=m4
@@ -10,7 +10,8 @@ REGRESS_TARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 \
     test-m4wrap3 test-gm4wrap3 test-fibo \
     test-patterns trip test-strangequotes test-redef test-quotes \
     test-weird test-args test-esyscmd test-eval test-gnupatterns \
-    test-gnupatterns2 test-comments test-synch1 test-synch1bis
+    test-gnupatterns2 test-comments test-synch1 test-synch1bis \
+    test-gnuformat
 
 test-ff_after_dnl: ff_after_dnl.m4
 	${M4} ff_after_dnl.m4 | diff - ${.CURDIR}/ff_after_dnl.out
@@ -39,6 +40,9 @@ test-gnupatterns:
 test-gnupatterns2:
 	${M4} -g ${.CURDIR}/gnupatterns2.m4 | diff - ${.CURDIR}/gnupatterns2.out
 
+test-gnuformat:
+	${M4} -g ${.CURDIR}/gnuformat.m4 | diff - ${.CURDIR}/gnuformat.out
+
 fibo.out:
 	perl ${.CURDIR}/fibo.pl ${FIBOMAX} >$@
 
diff --git a/regress/usr.bin/m4/gnuformat.m4 b/regress/usr.bin/m4/gnuformat.m4
new file mode 100644
index 00000000000..b9cf8b7d92c
--- /dev/null
+++ b/regress/usr.bin/m4/gnuformat.m4
@@ -0,0 +1 @@
+format(`a%15sa%%b%-15sbc%3scd%-3sd', `string', `pouet', `toolong', `toolong2')
diff --git a/regress/usr.bin/m4/gnuformat.out b/regress/usr.bin/m4/gnuformat.out
new file mode 100644
index 00000000000..3f484d61d4d
--- /dev/null
+++ b/regress/usr.bin/m4/gnuformat.out
@@ -0,0 +1 @@
+a         stringa%bpouet          bctoolongcdtoolong2d