From owner-freebsd-testing@FreeBSD.ORG Thu Jan 23 20:56:08 2014 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 ESMTPS id CB7A6376; Thu, 23 Jan 2014 20:56:08 +0000 (UTC) Received: from mail-we0-x229.google.com (mail-we0-x229.google.com [IPv6:2a00:1450:400c:c03::229]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D6AD19F2; Thu, 23 Jan 2014 20:56:08 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id u57so1841930wes.0 for ; Thu, 23 Jan 2014 12:56:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=vg58nvju7ridrrb1GwxYnMdvrq0EqTqC9LoMX0LmIPg=; b=AQ27qDhOZe2DrA9k6Z6ByOcOQGy1F4IJ+Q/PvfXJuoipugUk/+izaoyMehNiLSuC2/ IGaKK/a/fY1Xg3a0PTXJ9QvFkQd242SSL78a3899+wGt/X4B0VpX860Eu1XbupcVnWsp HAzo4OyjZQuyCF5kCPIte4VyoNUk1ZrVfnHqrCrkXrMzy9AnTHx+L8CsuJ/X+W96WDah 90Bwxd85swsBf0cbYXtlYt5m4bURGle/Rp7l9qSYDCLkkTVQleiW9l3UkswjjgIHMV4m XVrC/sTWCnvNivKko537NkT11wU8b2VQilUG7UHX5DxJ4ItAsP1n8CLdCOgj/gzR5ISN SZUA== MIME-Version: 1.0 X-Received: by 10.194.240.41 with SMTP id vx9mr45927wjc.70.1390510566697; Thu, 23 Jan 2014 12:56:06 -0800 (PST) Sender: asomers@gmail.com Received: by 10.194.22.35 with HTTP; Thu, 23 Jan 2014 12:56:06 -0800 (PST) In-Reply-To: <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> Date: Thu, 23 Jan 2014 13:56:06 -0700 X-Google-Sender-Auth: 2165WS5vQUHSRVMt9Sg1F8xwDzc Message-ID: Subject: Re: Makefile.inc1.patch From: Alan Somers To: Garrett Cooper Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable Cc: "freebsd-testing@freebsd.org" , "Simon J. Gerraty" X-BeenThere: freebsd-testing@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Testing on FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jan 2014 20:56:08 -0000 On Thu, Jan 23, 2014 at 1:53 PM, Garrett Cooper wro= te: > On Jan 22, 2014, at 8:34 AM, Garrett Cooper wrote= : > >> >>> On Jan 22, 2014, at 7:42, Alan Somers wrote: >>> >>>> On Tue, Jan 21, 2014 at 3:17 PM, Garrett Cooper wrote: >>>> Hi all, >>>> The attached patch fixes/enhances the build so -DNO_TESTS is passed = properly through various sections of the build that don't require tests in = order to build/install. This should also fix Alan's recent reported issue w= ith -DWITH_TESTS failing on amd64. >>>> Cheers! >>>> -Garrett >>> >>> The patch doesn't work for me. I get the following error during >>> buildworld during stage 4.4. >> >> ... >> >> Oh yeah... It's that chicken and egg issue due to ATF now being controll= ed by MK_TESTS=3D=3Dyes... There's more to this patch I need to provide you= in order for things to work... > > Here=92s the working patch. The difference between this one and t= he prior version is that you have to explicitly override -DNO_TESTS when bu= ilding lib/atf* (Simon: do you have any comments?): > > -.if ${MK_TESTS} !=3D "no" > +.if defined(WITH_ATF) || ${MK_TESTS} !=3D "no" > +# Make sure WITH_ATF overrules -DNO_TESTS > +.if !defined(WITH_ATF) > +MAKE+=3D -DWITH_ATF > +.endif > > I unrolled most of the local changes to Makefile.inc1 on my githu= b fork so it=92ll be easier to spot if you diff it against my tree. > Thanks! > -Garrett Shouldn't that be "WITH_TESTS" instead of "WITH_ATF"? Those options got combined awhile back. -Alan