From nobody Wed Feb 9 00:24:19 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E403219A4F4E; Wed, 9 Feb 2022 00:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Jtgc35yKVz4g8C; Wed, 9 Feb 2022 00:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644366259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILVhnUVT3M6xxsXvI8XxxPysVe1pdwW7vaamoB0y99g=; b=yciD3jSQ4qlI//XnxPZ5wUZciU6n8Z3lKH+bMjc8S4m86Vrpz6XTv8s6HfsZUiszXjOvBo jmdPnbKo/9J+IQ2NWsM3p7XuTXyU5+PTpS6l7Dw6Y0iQXQZ2/lWeMV83CzJbLCvMwn1yPZ L+MlnGAPuXKWNvnjzNTeolyPy7a/SHkNhzyv+N8UnQUcP5x/5fjcDWJzd2ah/qcPzNpSVn 32x7/QcJiUNt2bZc56aX6/K6mYW8MRuD1PorYPdRR1XYYlzrqAuVsijJQCmA3uETqMO707 9rUkSsetlAZOUu/v94WDY7yN7b1GMa0BqK7sQUPpsQa75WygjfczFVt3t9sG0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AD5FC230EF; Wed, 9 Feb 2022 00:24:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2190OJoP057029; Wed, 9 Feb 2022 00:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2190OJgl057028; Wed, 9 Feb 2022 00:24:19 GMT (envelope-from git) Date: Wed, 9 Feb 2022 00:24:19 GMT Message-Id: <202202090024.2190OJgl057028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 5ae6cc00111c - main - test-includes: Simplify $OBJDIR requirements List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ae6cc00111c9a9bc70f6fc9db25bd191c069433 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644366259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ILVhnUVT3M6xxsXvI8XxxPysVe1pdwW7vaamoB0y99g=; b=G83GxDIkFKq42+zPKeaMjeODqQYTfD00bQkri7V2cTM5kLZ5zxpDzurMr6EjJ6B9qnDMZh 9UgAdtWlwhELMfWyA5ov7XbHUrZh5uuaSsI530UrPtt+ffXptQYlbHjBT8mTw8RBI71PhO foOfO1RjtSAmFAqZ/3FVjArHHX0zY3AP6uE/uSzBgTeDG3Y3wMmPXqUPk3P88Rj1S7soSz vwOD/L6UuuksTimbZVAPUcW1Uwfmo9HuDrd1LEzgGXWJ3TBM+7GIgdA1E9DNP/x3S/rJFC XM7YgjpiNnnxc7Z65zu4vJmSKJUDKh//1roXXqm4sKQ+ebBynOEK6rNbo9zhpw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644366259; a=rsa-sha256; cv=none; b=la5dt6L/dNTrZv4mwqPkK0eQgmvUv7eAUrHfInqizbiClzWNj0VwW3ds8UIa8p2yyrFGfH IsjcqvnLAR7GX1DNaQfvCZhqhRNlxnCAOqvAUA33B5Oo5tM1tEG+3CSui4PEeiHI6mM2jX q8uJX5TPGJiKrV3Tudbk5b7L4lPw5ky1iD0NNjKcz45e+YV9MTpNJo0Spg0tSSR8SNiYhc pSvxLt5FaXq20KReGZsPWGNIHA7yXMIRaoQKhIgZ4tzmLH7c87A7X6GIsiXCLiotzY+fEO pqixRKD9XdnHgLVNp6HD3CS6DfCKZm//6sbiSDNdFdnZysKzbfPLYkytwfJKMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=5ae6cc00111c9a9bc70f6fc9db25bd191c069433 commit 5ae6cc00111c9a9bc70f6fc9db25bd191c069433 Author: Warner Losh AuthorDate: 2022-02-09 00:23:31 +0000 Commit: Warner Losh CommitDate: 2022-02-09 00:23:43 +0000 test-includes: Simplify $OBJDIR requirements s=/=_=g in tested names so that all the objects live in $OBJDIR. This is more robust than depending on side effects of auto OBJDIR features and should fix buildworld issues some people have seen. Suggested by: sjg@ Sponsored by: Netflix --- tools/build/test-includes/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/build/test-includes/Makefile b/tools/build/test-includes/Makefile index 3ae39a2cb61f..707ab6f4ca47 100644 --- a/tools/build/test-includes/Makefile +++ b/tools/build/test-includes/Makefile @@ -24,11 +24,11 @@ CFLAGS.event.c= -D_WANT_KEVENT32 -D_WANT_FREEBSD11_KEVENT .include "badfiles.inc" -.for h in ${HDRS} +.for h c in ${HDRS:@x@$x ${x:S,/,_,g:R}.c@} .if !${BADHDRS:M${h}} -SRCS+= ${h:R}.c -CLEANFILES+=${h:R}.c -${h:R}.c: +SRCS+= $c +CLEANFILES+=$c +$c: echo "#include <$h>" > ${.TARGET} .endif .endfor