aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/Makefile4
-rw-r--r--etc/rc.d/Makefile4
-rw-r--r--tests/Makefile1
-rw-r--r--tests/etc/Makefile (renamed from etc/tests/Makefile)4
-rw-r--r--tests/etc/rc.d/Makefile (renamed from etc/rc.d/tests/Makefile)0
-rwxr-xr-xtests/etc/rc.d/routing_test.sh (renamed from etc/rc.d/tests/routing_test.sh)0
6 files changed, 4 insertions, 9 deletions
diff --git a/etc/Makefile b/etc/Makefile
index e8295b72e53c..e5195f67b7dc 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -10,10 +10,6 @@ SUBDIR= \
SUBDIR+=sendmail
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+=tests
-.endif
-
BIN1= crontab \
devd.conf \
devfs.conf \
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index f1f6afe52b02..1e6e28ffbaa6 100644
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -263,10 +263,6 @@ FILES+= routed
FILES+= sendmail
.endif
-.if ${MK_TESTS} != "no"
-SUBDIR+= tests
-.endif
-
.if ${MK_TIMED} != "no"
FILES+= timed
.endif
diff --git a/tests/Makefile b/tests/Makefile
index 89da82d2adf6..12c150973b65 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,6 +2,7 @@
.include <bsd.own.mk>
+SUBDIR= etc
SUBDIR= sys
TESTSDIR= ${TESTSBASE}
diff --git a/etc/tests/Makefile b/tests/etc/Makefile
index 5aacd5b19e57..9aad25c06395 100644
--- a/etc/tests/Makefile
+++ b/tests/etc/Makefile
@@ -4,7 +4,9 @@
TESTSDIR= ${TESTSBASE}/etc
-.PATH: ${.CURDIR:H:H}/tests
+.PATH: ${.CURDIR:H}
KYUAFILE= yes
+SUBDIR+= rc.d
+
.include <bsd.test.mk>
diff --git a/etc/rc.d/tests/Makefile b/tests/etc/rc.d/Makefile
index 368e8f4fc875..368e8f4fc875 100644
--- a/etc/rc.d/tests/Makefile
+++ b/tests/etc/rc.d/Makefile
diff --git a/etc/rc.d/tests/routing_test.sh b/tests/etc/rc.d/routing_test.sh
index 693af232ea39..693af232ea39 100755
--- a/etc/rc.d/tests/routing_test.sh
+++ b/tests/etc/rc.d/routing_test.sh