From 7afb8adff33d47f10a11368ff54bb2eec5b30165 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Mon, 18 May 2015 11:02:43 +0000 Subject: [PATCH] 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 Suggested by: jhb X-MFC with: r282059 MFC after: 1 week --- etc/Makefile | 4 ---- etc/rc.d/Makefile | 4 ---- tests/Makefile | 1 + {etc/tests => tests/etc}/Makefile | 4 +++- {etc/rc.d/tests => tests/etc/rc.d}/Makefile | 0 {etc/rc.d/tests => tests/etc/rc.d}/routing_test.sh | 0 6 files changed, 4 insertions(+), 9 deletions(-) rename {etc/tests => tests/etc}/Makefile (73%) rename {etc/rc.d/tests => tests/etc/rc.d}/Makefile (100%) rename {etc/rc.d/tests => tests/etc/rc.d}/routing_test.sh (100%) diff --git a/etc/Makefile b/etc/Makefile index e8295b72e53..e5195f67b7d 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 f1f6afe52b0..1e6e28ffbaa 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 89da82d2adf..12c150973b6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -2,6 +2,7 @@ .include +SUBDIR= etc SUBDIR= sys TESTSDIR= ${TESTSBASE} diff --git a/etc/tests/Makefile b/tests/etc/Makefile similarity index 73% rename from etc/tests/Makefile rename to tests/etc/Makefile index 5aacd5b19e5..9aad25c0639 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 diff --git a/etc/rc.d/tests/Makefile b/tests/etc/rc.d/Makefile similarity index 100% rename from etc/rc.d/tests/Makefile rename to tests/etc/rc.d/Makefile diff --git a/etc/rc.d/tests/routing_test.sh b/tests/etc/rc.d/routing_test.sh similarity index 100% rename from etc/rc.d/tests/routing_test.sh rename to tests/etc/rc.d/routing_test.sh