summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2005-03-02 10:12:42 +0000
committerMarc Espie <espie@cvs.openbsd.org>2005-03-02 10:12:42 +0000
commitecadb7d7ac35565b3209747c8e4af519d0fc4dde (patch)
tree4c8fadf163c94b8eea198a380d82fa741d28606a
parent0881d45f2f57f4fe554eaf02317176e510800e2d (diff)
more regression tests for wraps.
-rw-r--r--regress/usr.bin/m4/Makefile13
-rw-r--r--regress/usr.bin/m4/gm4wrap3.out4
-rw-r--r--regress/usr.bin/m4/m4wrap3.m411
-rw-r--r--regress/usr.bin/m4/m4wrap3.out4
4 files changed, 29 insertions, 3 deletions
diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index f07021e577e..9df1354e055 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2004/11/07 10:25:59 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2005/03/02 10:12:41 espie Exp $
FIBOMAX=25
M4=m4
@@ -6,9 +6,10 @@ M4=m4
.SUFFIXES: .m4 .m4.uu
CLEANFILES+= ff_after_dnl.m4 strangequotes.m4 fibo.out
-REGRESS_TARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 test-fibo \
+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-weird test-args test-esyscmd test-eval test-gnupatterns \
test-ff_after_dnl: ff_after_dnl.m4
${M4} ff_after_dnl.m4 | diff - ${.CURDIR}/ff_after_dnl.out
@@ -22,6 +23,12 @@ test-m4wrap:
test-m4wrap2:
test `${M4} ${.CURDIR}/m4wrap2.m4 | wc -c` == 0
+test-m4wrap3:
+ ${M4} ${.CURDIR}/m4wrap3.m4 | diff - ${.CURDIR}/m4wrap3.out
+
+test-gm4wrap3:
+ ${M4} -g ${.CURDIR}/m4wrap3.m4 | diff - ${.CURDIR}/gm4wrap3.out
+
test-patterns:
${M4} ${.CURDIR}/patterns.m4 | diff - ${.CURDIR}/patterns.out
diff --git a/regress/usr.bin/m4/gm4wrap3.out b/regress/usr.bin/m4/gm4wrap3.out
new file mode 100644
index 00000000000..3245eb5ad2c
--- /dev/null
+++ b/regress/usr.bin/m4/gm4wrap3.out
@@ -0,0 +1,4 @@
+normal m4 stuff
+a string
+this is
+recurse
diff --git a/regress/usr.bin/m4/m4wrap3.m4 b/regress/usr.bin/m4/m4wrap3.m4
new file mode 100644
index 00000000000..633b5d1ebb8
--- /dev/null
+++ b/regress/usr.bin/m4/m4wrap3.m4
@@ -0,0 +1,11 @@
+dnl $OpenBSD: m4wrap3.m4,v 1.1 2005/03/02 10:12:41 espie Exp $
+dnl Another test, this time for multiple wrappers
+dnl Check the behavior in presence of recursive m4wraps
+dnl both for POSIX m4 and for gnu-m4 mode
+m4wrap(`this is
+')dnl
+m4wrap(`a string
+')dnl
+m4wrap(`m4wrap(`recurse
+')')dnl
+normal m4 stuff
diff --git a/regress/usr.bin/m4/m4wrap3.out b/regress/usr.bin/m4/m4wrap3.out
new file mode 100644
index 00000000000..51b43f42d14
--- /dev/null
+++ b/regress/usr.bin/m4/m4wrap3.out
@@ -0,0 +1,4 @@
+normal m4 stuff
+this is
+a string
+recurse