From owner-freebsd-testing@FreeBSD.ORG Thu Jan 23 21:00:43 2014 Return-Path: Delivered-To: freebsd-testing@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 811024DE; Thu, 23 Jan 2014 21:00:43 +0000 (UTC) Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 466A51A36; Thu, 23 Jan 2014 21:00:43 +0000 (UTC) Received: by mail-pa0-f49.google.com with SMTP id hz1so2345683pad.36 for ; Thu, 23 Jan 2014 13:00:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=tZ18/nyziLRY2MULWEgL3QbzW/kuIuMMMiunlRFsqng=; b=UZGVwJT9zCnmD5AIzI2yl0fDAvC2GHV8giYBa1GYQG+FQ1Khn91S4KgokB2/Mj6doI ygjTcdFLn4DaDJ49PlnYnbRd38AAhsF35DUK2tJ6l56ZaLMFL8Vl+6YO8i3YTKExM5nm wowaC9DLTbUJTM6/zz6XY89M2XNqi4VZf3DBAPZvvPlEkeXWF64vEmIxqy9gCeURrU1r EqrweQCBgNuobOJpKESURRtG7fj4Vx855Ta1WULFZEYPNdhYSDQ+K3U1UOdbkpTVpGzt paYg1NbH4YJOUdagnvYmJ2rnHU+DyeW0kTVsAHDH5mrfxbw/pRR4aFBLwtjzdnOFRKX5 LjrA== X-Received: by 10.66.224.165 with SMTP id rd5mr10305462pac.119.1390510842706; Thu, 23 Jan 2014 13:00:42 -0800 (PST) Received: from fuji.zcorp.zonarsystems.com ([64.14.143.130]) by mx.google.com with ESMTPSA id pq1sm40975268pbc.8.2014.01.23.13.00.41 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 23 Jan 2014 13:00:42 -0800 (PST) Content-Type: text/plain; charset=windows-1252 Mime-Version: 1.0 (Mac OS X Mail 7.1 \(1827\)) Subject: Re: Makefile.inc1.patch From: Garrett Cooper In-Reply-To: Date: Thu, 23 Jan 2014 13:00:40 -0800 Content-Transfer-Encoding: quoted-printable Message-Id: References: <4A3E3984-73D3-4441-97A7-D58679EFF978@gmail.com> <9775878D-91AB-4BE4-ADFA-32D8DB582AA6@gmail.com> To: Alan Somers X-Mailer: Apple Mail (2.1827) 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 21:00:43 -0000 On Jan 23, 2014, at 12:56 PM, Alan Somers wrote: > On Thu, Jan 23, 2014 at 1:53 PM, Garrett Cooper = wrote: >> On Jan 22, 2014, at 8:34 AM, Garrett Cooper = wrote: >>=20 >>>=20 >>>> On Jan 22, 2014, at 7:42, Alan Somers wrote: >>>>=20 >>>>> 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 with -DWITH_TESTS failing on amd64. >>>>> Cheers! >>>>> -Garrett >>>>=20 >>>> The patch doesn't work for me. I get the following error during >>>> buildworld during stage 4.4. >>>=20 >>> ... >>>=20 >>> Oh yeah... It's that chicken and egg issue due to ATF now being = controlled by MK_TESTS=3D=3Dyes... There's more to this patch I need to = provide you in order for things to work... >>=20 >> Here=92s the working patch. The difference between this one = and the prior version is that you have to explicitly override -DNO_TESTS = when building lib/atf* (Simon: do you have any comments?): >>=20 >> -.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 >>=20 >> I unrolled most of the local changes to Makefile.inc1 on my = github fork so it=92ll be easier to spot if you diff it against my tree. >> Thanks! >> -Garrett >=20 > Shouldn't that be "WITH_TESTS" instead of "WITH_ATF"? Those options > got combined awhile back. Unfortunately no. The chicken and the egg problem I ran into is = like so: 1. make libraries shouldn=92t build tests (in particular it will bomb if = it tries to build something that needs to link against libatf*.so). This = isn=92t a problem today, but will become a problem when lib/libc/tests = is pushed back to FreeBSD. 2. lib/atf needs to be installed sooner so atf-check, etc link properly. This wasn=92t a chicken and egg problem until the two knobs were = merged=85 Thanks! -Garrett=