From: espie <espie@openbsd.org>
Date: Sat, 16 Aug 2008 10:02:32 +0000 (+0000)
Subject: another issue for which I have a patch.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=751170ae5c977ac2367028e1b03bba604cad3b02;p=openbsd

another issue for which I have a patch.
Issue reported by Vortechz Anderson <utg_vrtz@yahoo.se>
---

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