Date: Mon, 18 May 2015 11:02:43 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r283056 - in head: etc etc/rc.d etc/rc.d/tests etc/tests tests tests/etc tests/etc/rc.d Message-ID: <201505181102.t4IB2hP0028212@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon May 18 11:02:43 2015 New Revision: 283056 URL: https://svnweb.freebsd.org/changeset/base/283056 Log: 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 Added: head/tests/etc/ head/tests/etc/Makefile - copied, changed from r283052, head/etc/tests/Makefile head/tests/etc/rc.d/ - copied from r283052, head/etc/rc.d/tests/ Deleted: head/etc/rc.d/tests/ head/etc/tests/Makefile Modified: head/etc/Makefile head/etc/rc.d/Makefile head/tests/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Mon May 18 10:46:51 2015 (r283055) +++ head/etc/Makefile Mon May 18 11:02:43 2015 (r283056) @@ -10,10 +10,6 @@ SUBDIR= \ SUBDIR+=sendmail .endif -.if ${MK_TESTS} != "no" -SUBDIR+=tests -.endif - BIN1= crontab \ devd.conf \ devfs.conf \ Modified: head/etc/rc.d/Makefile ============================================================================== --- head/etc/rc.d/Makefile Mon May 18 10:46:51 2015 (r283055) +++ head/etc/rc.d/Makefile Mon May 18 11:02:43 2015 (r283056) @@ -263,10 +263,6 @@ FILES+= routed FILES+= sendmail .endif -.if ${MK_TESTS} != "no" -SUBDIR+= tests -.endif - .if ${MK_TIMED} != "no" FILES+= timed .endif Modified: head/tests/Makefile ============================================================================== --- head/tests/Makefile Mon May 18 10:46:51 2015 (r283055) +++ head/tests/Makefile Mon May 18 11:02:43 2015 (r283056) @@ -2,6 +2,7 @@ .include <bsd.own.mk> +SUBDIR= etc SUBDIR= sys TESTSDIR= ${TESTSBASE} Copied and modified: head/tests/etc/Makefile (from r283052, head/etc/tests/Makefile) ============================================================================== --- head/etc/tests/Makefile Mon May 18 08:12:08 2015 (r283052, copy source) +++ head/tests/etc/Makefile Mon May 18 11:02:43 2015 (r283056) @@ -4,7 +4,9 @@ TESTSDIR= ${TESTSBASE}/etc -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${.CURDIR:H} KYUAFILE= yes +SUBDIR+= rc.d + .include <bsd.test.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505181102.t4IB2hP0028212>