From f0a35bce36287194e6853eb8503560544277c405 Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Wed, 24 Aug 2016 22:31:41 +0000
Subject: [PATCH] Move the pf address printing test into its own subdirectory. 
 This makes it consistent with the regress tree structure.

---
 regress/sys/net/Makefile                      | 22 +++----------------
 regress/sys/net/pf_print/Makefile             | 17 ++++++++++++++
 .../sys/net/{ => pf_print}/pf_print_test.c    |  2 +-
 3 files changed, 21 insertions(+), 20 deletions(-)
 create mode 100644 regress/sys/net/pf_print/Makefile
 rename regress/sys/net/{ => pf_print}/pf_print_test.c (97%)

diff --git a/regress/sys/net/Makefile b/regress/sys/net/Makefile
index 01ac6582bad..3d82195eff5 100644
--- a/regress/sys/net/Makefile
+++ b/regress/sys/net/Makefile
@@ -1,21 +1,5 @@
-#	$OpenBSD: Makefile,v 1.7 2015/10/26 08:04:10 vgross Exp $
+#	$OpenBSD: Makefile,v 1.8 2016/08/24 22:31:41 bluhm Exp $
 
-SUBDIR +=	pf_divert pf_forward pf_fragment rdomains
+SUBDIR +=	pf_divert pf_forward pf_fragment pf_print rdomains
 
-.MAIN: regress
-
-PROG=		pf_print_test
-CLEANFILES=	pf_print_host.c
-CFLAGS=		-Wall
-CPPFLAGS=	-I.
-
-pf_print_host.c: ../../../sys/net/pf.c Makefile
-	sed -n '/^pf_print_host/{x;p;x;};/^pf_print_host/,/^}/p;h' \
-	    ${.CURDIR}/../../../sys/net/pf.c >$@.tmp
-	mv $@.tmp $@
-
-beforedepend: pf_print_host.c
-
-pf_print_test.o: pf_print_test.c pf_print_host.c
-
-.include <bsd.regress.mk>
+.include <bsd.subdir.mk>
diff --git a/regress/sys/net/pf_print/Makefile b/regress/sys/net/pf_print/Makefile
new file mode 100644
index 00000000000..2ffe825506e
--- /dev/null
+++ b/regress/sys/net/pf_print/Makefile
@@ -0,0 +1,17 @@
+#	$OpenBSD: Makefile,v 1.1 2016/08/24 22:31:41 bluhm Exp $
+
+PROG=		pf_print_test
+CLEANFILES=	pf_print_host.c
+CFLAGS=		-Wall
+CPPFLAGS=	-I.
+
+pf_print_host.c: ../../../../sys/net/pf.c Makefile
+	sed -n '/^pf_print_host/{x;p;x;};/^pf_print_host/,/^}/p;h' \
+	    ${.CURDIR}/../../../../sys/net/pf.c >$@.tmp
+	mv $@.tmp $@
+
+beforedepend: pf_print_host.c
+
+pf_print_test.o: pf_print_test.c pf_print_host.c
+
+.include <bsd.regress.mk>
diff --git a/regress/sys/net/pf_print_test.c b/regress/sys/net/pf_print/pf_print_test.c
similarity index 97%
rename from regress/sys/net/pf_print_test.c
rename to regress/sys/net/pf_print/pf_print_test.c
index 212d72f7530..835390794f7 100644
--- a/regress/sys/net/pf_print_test.c
+++ b/regress/sys/net/pf_print/pf_print_test.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pf_print_test.c,v 1.5 2015/02/09 12:01:41 deraadt Exp $ */
+/*	$OpenBSD: pf_print_test.c,v 1.1 2016/08/24 22:31:41 bluhm Exp $ */
 
 /*
  * Copyright (c) 2008, 2013 Alexander Bluhm <bluhm@openbsd.org>
-- 
2.20.1