aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnji Cooper <ngie@FreeBSD.org>2015-04-27 07:00:34 +0000
committerEnji Cooper <ngie@FreeBSD.org>2015-04-27 07:00:34 +0000
commit61f63dbbb194625d7cfd57246484c9bd50087b30 (patch)
tree9e62014bacf7cfa03ee166549f338b20e8c3a9d6
parent1119ece4d355e7995ed360f4e7d1e61a1f428046 (diff)
downloadsrc-61f63dbbb194625d7cfd57246484c9bd50087b30.tar.gz
src-61f63dbbb194625d7cfd57246484c9bd50087b30.zip
Notes
-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 1e6e28ffbaa6..f1f6afe52b02 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 368e8f4fc875..368e8f4fc875 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 693af232ea39..693af232ea39 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 fd9efdaa566c..5aacd5b19e57 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>