diff options
| author | ngie <ngie@FreeBSD.org> | 2015-05-18 11:02:43 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-05-18 11:02:43 +0000 |
| commit | 110cd2db75fc5951e5df85c6e7ccd20126ab6e29 (patch) | |
| tree | 9d6c17d6cbfe4d594075538ec3b88223a2a5b33c | |
| parent | e1077ab7dc2d0fb32e342337d5a456cbfaf9f2d4 (diff) | |
| download | FreeBSD-src-110cd2db75fc5951e5df85c6e7ccd20126ab6e29.zip FreeBSD-src-110cd2db75fc5951e5df85c6e7ccd20126ab6e29.tar.gz | |
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
X-MFC with: r282059
MFC after: 1 week
| -rw-r--r-- | etc/Makefile | 4 | ||||
| -rw-r--r-- | etc/rc.d/Makefile | 4 | ||||
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -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-x | tests/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 e8295b7..e5195f6 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 f1f6afe..1e6e28f 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 89da82d..12c1509 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 5aacd5b..9aad25c 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 368e8f4..368e8f4 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 693af23..693af23 100755 --- a/etc/rc.d/tests/routing_test.sh +++ b/tests/etc/rc.d/routing_test.sh |
