From owner-freebsd-testing@FreeBSD.ORG Wed Nov 6 17:15:14 2013 Return-Path: Delivered-To: freebsd-testing@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 ESMTP id 4DC07E29 for ; Wed, 6 Nov 2013 17:15:14 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-vb0-x22a.google.com (mail-vb0-x22a.google.com [IPv6:2607:f8b0:400c:c02::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0DB5E2E0C for ; Wed, 6 Nov 2013 17:15:13 +0000 (UTC) Received: by mail-vb0-f42.google.com with SMTP id p14so3672398vbm.29 for ; Wed, 06 Nov 2013 09:15:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=/QxwOeJnm040iZU1dUKuKp3Ln1MPDFN+Q8tnlgpVIwc=; b=H2JWceFu6NE1RHHb6F/aa6h5ceMRgzALSmingK9YRNKTRoYRGY5bGQbkpfSSvNUaeV secT4dVzbtCCIXRDIYrUKXJUUfjeTYB/YgZFmR4zSP9rLgv8AtqZxyhmbffJDfA3J2gE n12hJsJGbiPAAKn2M/6LgyPq5jb6ozz4T+YGlH47SwonBWVyVaWwy4JqCEJ6AHxxWZJx SHPmOTs0iICJWlnlL4ptmvKEXCi1IR5dEXfjCBjvnoTkFXp2BUlNlmhIS7wLe/HhrS3b u0zGhTmJ4n3b/XFTlc84bi4dBtZdYMuAyH9QQD2sDBEbuGECOFMwICPbgmukjh05VXLC eVQA== MIME-Version: 1.0 X-Received: by 10.220.253.66 with SMTP id mz2mr3319168vcb.10.1383758113203; Wed, 06 Nov 2013 09:15:13 -0800 (PST) Received: by 10.220.14.196 with HTTP; Wed, 6 Nov 2013 09:15:13 -0800 (PST) In-Reply-To: References: Date: Wed, 6 Nov 2013 09:15:13 -0800 Message-ID: Subject: Re: Fixing the build with TESTS From: Garrett Cooper To: Julio Merino Content-Type: text/plain; charset=ISO-8859-1 Cc: Rui Paulo , "freebsd-testing@freebsd.org" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Nov 2013 17:15:14 -0000 On Tue, Nov 5, 2013 at 7:26 PM, Julio Merino wrote: > On Tue, Nov 05, 2013 at 05:52:29PM -0800, Garrett Cooper wrote: >> I fixed this on my branch some time ago. See this patch for more >> details (from http://lists.freebsd.org/pipermail/freebsd-toolchain/2013-April/000804.html >> ) : http://lists.freebsd.org/pipermail/freebsd-toolchain/attachments/20130424/c44daa61/attachment.obj >> . >> >> If you change the former patch to refer to lib/atf instead of >> lib/atf/libatf-c, things will just work too is the order is properly >> specified in lib/atf :). >> >> I've attached entire up-to-date patch set, just for simplicity. > > I like your approach more. However, it seems that your change to > bsd.own.mk could be better handled by the existing NO_* functionality, > couldn't it? > > Updated the two patches and descriptions accordingly. > Please take another look! It's a little bit trickier than that; my updated diff doesn't take bmake into account as I was able to unbmake-ify atf.tests.mk, bsd.tests.mk, and bsd.progs.mk. The original diff for bsd.own.mk looked like this: +# bsd.test.mk doesn't work with !bmake. Also don't build tests if NO_TESTS is +# defined; this is for buildworld and elsewhere (ports potentially). +.if defined(.PARSEDIR) && !defined(NO_TESTS) +__DEFAULT_NO_OPTIONS+=TESTS +.else +MK_TESTS:= no +.endif But I agree, yes.. that's no longer necessary on my branch. Thanks! -Garrett