summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorngie <ngie@FreeBSD.org>2015-05-31 22:39:48 +0000
committerngie <ngie@FreeBSD.org>2015-05-31 22:39:48 +0000
commitf0e277f5171cddbc8070bd69b08c2cda46ea16c9 (patch)
treedea2fcf3dbbd6221861e9980641260e7426396e9 /etc
parentbaef3fdea06230e5063198b5c21256e205fe907d (diff)
downloadFreeBSD-src-f0e277f5171cddbc8070bd69b08c2cda46ea16c9.zip
FreeBSD-src-f0e277f5171cddbc8070bd69b08c2cda46ea16c9.tar.gz
MFC r277627,r277650,r282059,r283056,r283840,r283845:
r277627 (by will): Add routing_test:static_ipv6_loopback_route_for_each_fib. It tests that all FIBs get a static IPv6 loopback route. Submitted by: asomers Sponsored by: Spectra Logic MFSpectraBSD: 1048456 on 2014/03/13 1114523 on 2015/01/23 r277650 (by will): Add tests/etc/rc.d to mtree. Submitted by: stefanf MFC with: 277627 r282059: 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 r283056: Move all test integration pieces for etc/ from etc/ to tests/ This is being done to fix breakage with make distribution with read-only source trees as make distribution doesn't use make obj like building tests/ does in all cases Reported by: Wolfgang Zenker <wolfgang@lyxys.ka.sub.org> Suggested by: jhb r283840: Remove empty tests directory r283845: Append to SUBDIR, not set it Pointyhat to: ngie
Diffstat (limited to 'etc')
-rw-r--r--etc/Makefile4
-rw-r--r--etc/mtree/BSD.tests.dist2
-rw-r--r--etc/tests/Makefile10
3 files changed, 2 insertions, 14 deletions
diff --git a/etc/Makefile b/etc/Makefile
index e3c02f6..2b02717 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/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist
index bb260ed..692cf40 100644
--- a/etc/mtree/BSD.tests.dist
+++ b/etc/mtree/BSD.tests.dist
@@ -50,6 +50,8 @@
..
..
etc
+ rc.d
+ ..
..
games
..
diff --git a/etc/tests/Makefile b/etc/tests/Makefile
deleted file mode 100644
index 5aacd5b..0000000
--- a/etc/tests/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $FreeBSD$
-
-.include <bsd.own.mk>
-
-TESTSDIR= ${TESTSBASE}/etc
-
-.PATH: ${.CURDIR:H:H}/tests
-KYUAFILE= yes
-
-.include <bsd.test.mk>
OpenPOWER on IntegriCloud