From owner-svn-src-all@FreeBSD.ORG Thu May 15 13:31:09 2014 Return-Path: Delivered-To: svn-src-all@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 F03D0AD5 for ; Thu, 15 May 2014 13:31:09 +0000 (UTC) Received: from mail-ig0-f172.google.com (mail-ig0-f172.google.com [209.85.213.172]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B6A99283A for ; Thu, 15 May 2014 13:31:09 +0000 (UTC) Received: by mail-ig0-f172.google.com with SMTP id uy17so7911756igb.17 for ; Thu, 15 May 2014 06:31:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:content-type:mime-version:subject:from :in-reply-to:date:cc:content-transfer-encoding:message-id:references :to; bh=Ch7jFEPF/hEzDtLkLveK+I6uJodKtzobKL/BPMc/bIo=; b=MDlpJVeeCsrbkyfYx86cy3EbMDR8EdAL9S6FxbxCNvjh2/zDO1EijPbYooFdCa8TRE flmUa8XbOVDsz4PSV8WbDu5V4ic9NRKJ5nj0UZk23rku+V+ZhcTNxAlg0x8A6hZNizCU as3iRnkxiLiHVtNxaRgRiJhCwFOt3Qlca7p3Ewr3xBpKM0IFqFPbeRb+ZItDOXMpQHw3 PxcumW8ByHtkHvPtoK7jEqSuV1SyMy1UTvsc6hXkEawSYNZymzGT3I7o0wAl3+43QaGM yPIeDd+0LmvBiRc8PEPuNMNLlRtxQwLTdlWeC+ihKmCoqYYESR08SjnkXYvM8iEzBr1S mdxQ== X-Gm-Message-State: ALoCoQk5LT7knq0MWBHSmkic7D1OJIx4mZIT9ecK0o05P9edBLAGYlVsxED0cLhlm0umUeOCiBoZ X-Received: by 10.42.41.14 with SMTP id n14mr9218617ice.30.1400160668349; Thu, 15 May 2014 06:31:08 -0700 (PDT) Received: from [10.69.210.117] ([137.122.64.30]) by mx.google.com with ESMTPSA id n5sm13130490ige.22.2014.05.15.06.31.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 06:31:07 -0700 (PDT) Sender: Julio Merino Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) Subject: Re: svn commit: r266104 - head/usr.bin/bmake From: Julio Merino In-Reply-To: <201405150127.s4F1RPxK072767@svn.freebsd.org> Date: Thu, 15 May 2014 09:31:04 -0400 Content-Transfer-Encoding: quoted-printable Message-Id: <538F0E8D-DF1A-4593-BF82-7AC9307EAA3E@freebsd.org> References: <201405150127.s4F1RPxK072767@svn.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.1874) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 May 2014 13:31:10 -0000 On May 14, 2014, at 21:27, Warner Losh wrote: > Author: imp > Date: Thu May 15 01:27:24 2014 > New Revision: 266104 > URL: http://svnweb.freebsd.org/changeset/base/266104 >=20 > Log: > Undo changes to the generated Makefile. Move tests directory to = proper > location, including updating the test to work in the more-fragile > fmake -> bmake bootstrap environment. >=20 > Modified: > head/usr.bin/bmake/Makefile > head/usr.bin/bmake/Makefile.inc [...] > Modified: head/usr.bin/bmake/Makefile.inc > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/usr.bin/bmake/Makefile.inc Thu May 15 01:06:27 2014 = (r266103) > +++ head/usr.bin/bmake/Makefile.inc Thu May 15 01:27:24 2014 = (r266104) > @@ -13,5 +13,9 @@ PROG=3D make > NO_SHARED?=3D YES > .endif >=20 > +.if defined(MK_TESTS) && ${MK_TESTS} !=3D no > +SUBDIR+=3D tests > +.endif > + Ugh, and this broke the build when MK_TESTS=3Dyes. The problem is that = tests/Makefile transparently includes ../Makefile.inc, which defines = SUBDIR+=3Dtests (as above)... and this is obviously invalid within the = tests subdirectory. What's your suggestion to fix this? I can think of renaming = Makefile.inc to something different to ensure that the subdirectories = don't spuriously include it.=09=