diff options
| author | ngie <ngie@FreeBSD.org> | 2015-04-13 10:30:30 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-04-13 10:30:30 +0000 |
| commit | d95512e0303ffba719b25f7fd6c423f1a4d690ed (patch) | |
| tree | ad99a0488cd392e30e81412ebfc47f999e2c02e2 | |
| parent | 1008de0400f5d472559e7f2f2dc8fe0822c1a1ba (diff) | |
| download | FreeBSD-src-d95512e0303ffba719b25f7fd6c423f1a4d690ed.zip FreeBSD-src-d95512e0303ffba719b25f7fd6c423f1a4d690ed.tar.gz | |
Move etc/tests/rc.d to etc/rc.d/tests to match the desired directory layout
| -rw-r--r-- | etc/rc.d/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc.d/tests/Makefile (renamed from etc/tests/rc.d/Makefile) | 0 | ||||
| -rwxr-xr-x | etc/rc.d/tests/routing_test.sh (renamed from etc/tests/rc.d/routing_test.sh) | 0 | ||||
| -rw-r--r-- | etc/tests/Makefile | 2 |
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> |
