summaryrefslogtreecommitdiff
path: root/regress/usr.bin
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2008-08-16 10:02:33 +0000
committerMarc Espie <espie@cvs.openbsd.org>2008-08-16 10:02:33 +0000
commit9a5ba52ee51a7afba45581b5b2bf2f2c50e03b4f (patch)
treef12f14a42fe2545c749d956b7cf616ca636a9842 /regress/usr.bin
parentbb1d294db8a3da41f74045cbf621bd2047173442 (diff)
another issue for which I have a patch.
Issue reported by Vortechz Anderson <utg_vrtz@yahoo.se>
Diffstat (limited to 'regress/usr.bin')
-rw-r--r--regress/usr.bin/m4/Makefile8
-rw-r--r--regress/usr.bin/m4/includes.aux2
-rw-r--r--regress/usr.bin/m4/includes.m44
-rw-r--r--regress/usr.bin/m4/includes.out1
4 files changed, 13 insertions, 2 deletions
diff --git a/regress/usr.bin/m4/Makefile b/regress/usr.bin/m4/Makefile
index aad71707658..d884ba9f65f 100644
--- a/regress/usr.bin/m4/Makefile
+++ b/regress/usr.bin/m4/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2008/08/16 09:57:12 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2008/08/16 10:02:32 espie Exp $
FIBOMAX=25
M4=m4
@@ -11,7 +11,7 @@ REGRESS_TARGETS= test-ff_after_dnl test-m4wrap test-m4wrap2 \
test-patterns trip test-strangequotes test-redef test-quotes \
test-weird test-args test-args2 test-esyscmd test-eval test-gnupatterns \
test-gnupatterns2 test-comments test-synch1 test-synch1bis \
- test-gnuformat
+ test-gnuformat test-includes
test-ff_after_dnl: ff_after_dnl.m4
${M4} ff_after_dnl.m4 | diff - ${.CURDIR}/ff_after_dnl.out
@@ -74,6 +74,10 @@ test-args2:
test-args:
${M4} ${.CURDIR}/args.m4 | diff - ${.CURDIR}/args.out
+test-includes:
+ ${M4} -I${.CURDIR} ${.CURDIR}/includes.m4 | \
+ diff - ${.CURDIR}/includes.out
+
test-esyscmd:
${M4} ${.CURDIR}/esyscmd.m4 | diff -u - ${.CURDIR}/esyscmd.out
diff --git a/regress/usr.bin/m4/includes.aux b/regress/usr.bin/m4/includes.aux
new file mode 100644
index 00000000000..e0a85730c0e
--- /dev/null
+++ b/regress/usr.bin/m4/includes.aux
@@ -0,0 +1,2 @@
+dnl $OpenBSD: includes.aux,v 1.1 2008/08/16 10:02:32 espie Exp $
+hello world dnl
diff --git a/regress/usr.bin/m4/includes.m4 b/regress/usr.bin/m4/includes.m4
new file mode 100644
index 00000000000..b24b0819703
--- /dev/null
+++ b/regress/usr.bin/m4/includes.m4
@@ -0,0 +1,4 @@
+dnl $OpenBSD: includes.m4,v 1.1 2008/08/16 10:02:32 espie Exp $
+dnl Check that include can occur within parameters
+define(`foo', include(includes.aux))dnl
+foo
diff --git a/regress/usr.bin/m4/includes.out b/regress/usr.bin/m4/includes.out
new file mode 100644
index 00000000000..4a1f4754cfd
--- /dev/null
+++ b/regress/usr.bin/m4/includes.out
@@ -0,0 +1 @@
+hello world