From owner-svn-src-stable@FreeBSD.ORG Mon Dec 30 14:09:04 2013 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B41E0FD2; Mon, 30 Dec 2013 14:09:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F1F21F12; Mon, 30 Dec 2013 14:09:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBUE94Qu054011; Mon, 30 Dec 2013 14:09:04 GMT (envelope-from jmmv@svn.freebsd.org) Received: (from jmmv@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBUE94BE054010; Mon, 30 Dec 2013 14:09:04 GMT (envelope-from jmmv@svn.freebsd.org) Message-Id: <201312301409.rBUE94BE054010@svn.freebsd.org> From: Julio Merino Date: Mon, 30 Dec 2013 14:09:04 +0000 (UTC) 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 X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Dec 2013 14:09:04 -0000 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