Date: Mon, 30 Dec 2013 14:09:04 +0000 (UTC) From: Julio Merino <jmmv@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260085 - stable/10/tools/build/mk Message-ID: <201312301409.rBUE94BE054010@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jmmv Date: Mon Dec 30 14:09:04 2013 New Revision: 260085 URL: http://svnweb.freebsd.org/changeset/base/260085 Log: Fix 'make check-old' warnings when WITHOUT_TESTS is set. This is a MFC of r258025 and r257940, both of which resolve issues with dynamically setting the list of obsolete files based on the contents of /usr/tests. Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Mon Dec 30 13:05:19 2013 (r260084) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Mon Dec 30 14:09:04 2013 (r260085) @@ -4143,11 +4143,13 @@ OLD_FILES+=usr/share/man/man4/atf-test-c OLD_FILES+=usr/share/mk/atf.test.mk # Test suite. -TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,' +. if(exists(${DESTDIR}/usr/tests/)) +TESTS_DIRS!=find ${DESTDIR}/usr/tests -type d | sed -e 's,^${DESTDIR}/,,'; echo OLD_DIRS+=${TESTS_DIRS} -TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,' +TESTS_FILES!=find ${DESTDIR}/usr/tests \! -type d | sed -e 's,^${DESTDIR}/,,'; echo OLD_FILES+=${TESTS_FILES} -.endif +. endif +.endif # Test suite. #.if ${MK_TOOLCHAIN} == no # to be filled in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312301409.rBUE94BE054010>