summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-04-27 07:00:34 +0000
committerngie <ngie@FreeBSD.org>2015-04-27 07:00:34 +0000
commitcb7fbcfd6c008a4680901ee94c08f532c6dc4003 (patch)
tree9e62014bacf7cfa03ee166549f338b20e8c3a9d6 /etc
parente70955b9f3e0bf50084cce2441cbef78855cfe72 (diff)
parentd95512e0303ffba719b25f7fd6c423f1a4d690ed (diff)
downloadFreeBSD-src-cb7fbcfd6c008a4680901ee94c08f532c6dc4003.zip
FreeBSD-src-cb7fbcfd6c008a4680901ee94c08f532c6dc4003.tar.gz
Move etc/tests/rc.d to etc/rc.d/tests to match the directory layout jmmv@
documented and implemented in other areas of the FreeBSD tree MFC after: 1 week
Diffstat (limited to 'etc')
-rw-r--r--etc/rc.d/Makefile4
-rw-r--r--etc/rc.d/tests/Makefile (renamed from etc/tests/rc.d/Makefile)0
-rwxr-xr-xetc/rc.d/tests/routing_test.sh (renamed from etc/tests/rc.d/routing_test.sh)0
-rw-r--r--etc/tests/Makefile2
4 files changed, 4 insertions, 2 deletions
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 1e6e28f..f1f6afe 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -263,6 +263,10 @@ FILES+= routed
FILES+= sendmail
.endif
+.if ${MK_TESTS} != "no"
+SUBDIR+= tests
+.endif
+
.if ${MK_TIMED} != "no"
FILES+= timed
.endif
diff --git a/etc/tests/rc.d/Makefile b/etc/rc.d/tests/Makefile
index 368e8f4..368e8f4 100644
--- a/etc/tests/rc.d/Makefile
+++ b/etc/rc.d/tests/Makefile
diff --git a/etc/tests/rc.d/routing_test.sh b/etc/rc.d/tests/routing_test.sh
index 693af23..693af23 100755
--- a/etc/tests/rc.d/routing_test.sh
+++ b/etc/rc.d/tests/routing_test.sh
diff --git a/etc/tests/Makefile b/etc/tests/Makefile
index fd9efda..5aacd5b 100644
--- a/etc/tests/Makefile
+++ b/etc/tests/Makefile
@@ -7,6 +7,4 @@ TESTSDIR= ${TESTSBASE}/etc
.PATH: ${.CURDIR:H:H}/tests
KYUAFILE= yes
-TESTS_SUBDIRS+= rc.d
-
.include <bsd.test.mk>
OpenPOWER on IntegriCloud