From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5E85EC3F6B0 for ; Fri, 5 Aug 2022 17:16:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241069AbiHERQK (ORCPT ); Fri, 5 Aug 2022 13:16:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37382 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236261AbiHERQJ (ORCPT ); Fri, 5 Aug 2022 13:16:09 -0400 Received: from smtp-42ab.mail.infomaniak.ch (smtp-42ab.mail.infomaniak.ch [84.16.66.171]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C952A422E7 for ; Fri, 5 Aug 2022 10:16:07 -0700 (PDT) Received: from smtp-3-0000.mail.infomaniak.ch (unknown [10.4.36.107]) by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4Lzsgp0LP4zMqK1c; Fri, 5 Aug 2022 19:16:06 +0200 (CEST) Received: from ns3096276.ip-94-23-54.eu (unknown [23.97.221.149]) by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4Lzsgn3LXJzlrKd0; Fri, 5 Aug 2022 19:16:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=digikod.net; s=20191114; t=1659719766; bh=lNZkRZlxYcCJLjsqfaYlILC0M7oDXWgtnjCf/3RVbso=; h=Date:To:Cc:References:From:Subject:In-Reply-To:From; b=nlMcoVN0nI7/hM8/BvLhgkqom/D3l9NBJGb+AvenQOKT9B64m2q2mF6yym8jifJdc wagOCf6RToWl4xwARp+ViE9QU+5XJJXVxfzmvPzOU8Pvtv21I0FjKLlZCtCPFud9Kv TdDiviqF5B+g0Tnm7E+EsSnVaX4q9lsBv8m0JBpw= Message-ID: <3de9a64e-6f27-8f76-9626-6ee082d382ea@digikod.net> Date: Fri, 5 Aug 2022 19:16:04 +0200 MIME-Version: 1.0 User-Agent: Content-Language: en-US To: Guillaume Tucker , Shuah Khan Cc: Anders Roxell , Tim.Bird@sony.com, kernel@collabora.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-security-module@vger.kernel.org References: <76a2ac43-6e3d-0b62-7c8c-eec5f247f8f8@collabora.com> From: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= Subject: Re: [PATCH] selftests/landlock: fix broken include of linux/landlock.h In-Reply-To: <76a2ac43-6e3d-0b62-7c8c-eec5f247f8f8@collabora.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: On 04/08/2022 21:38, Guillaume Tucker wrote: > On 04/08/2022 12:36, Mickaël Salaün wrote: >> >> On 03/08/2022 22:13, Guillaume Tucker wrote: >>> Revert part of the earlier changes to fix the kselftest build when >>> using a sub-directory from the top of the tree as this broke the >>> landlock test build as a side-effect when building with "make -C >>> tools/testing/selftests/landlock". >>> >>> Reported-by: Mickaël Salaün >>> Fixes: a917dd94b832 ("selftests/landlock: drop deprecated headers dependency") >>> Fixes: f2745dc0ba3d ("selftests: stop using KSFT_KHDR_INSTALL") >>> Signed-off-by: Guillaume Tucker >>> --- >>>   tools/testing/selftests/landlock/Makefile | 7 +++++-- >>>   1 file changed, 5 insertions(+), 2 deletions(-) >>> >>> diff --git a/tools/testing/selftests/landlock/Makefile b/tools/testing/selftests/landlock/Makefile >>> index a6959df28eb0..02868ac3bc71 100644 >>> --- a/tools/testing/selftests/landlock/Makefile >>> +++ b/tools/testing/selftests/landlock/Makefile >>> @@ -9,10 +9,13 @@ TEST_GEN_PROGS := $(src_test:.c=) >>>   TEST_GEN_PROGS_EXTENDED := true >>>     OVERRIDE_TARGETS := 1 >>> +top_srcdir := ../../../.. >> >> Not sure it changes much, but most other selftests Makefiles use "top_srcdir = ../../../.." (without ":="). Why this change? > > I didn't simply apply your diff but edited the file by hand to > test various combinations and see what side effects it might > have. So when I added top_srcdir I typed it by hand and used := > as a reflex since it's the standard way of assigning variables. > Using = instead only makes a difference when the r-value has > something dynamic as it will be re-evaluated every time it's > used. So for constant values, I guess it's more of a question of > coding style and conventions. Maybe all the top_srcdir variables > should be changed to := but that's unnecessary churn... Either > way, it's benign. > > Shuah, feel free to change this back to = in this particular case > if it's more consistent with other Makefiles. Consistency is > often better than arbitrary rules. Or conversely, change to := > for the khdr_dir definition... Entirely up to you I think. Looks good to me, thanks! Shuah, feel free to add Signed-off-by: Mickaël Salaün > > Thanks, > Guillaume > >>>   include ../lib.mk >>>   +khdr_dir = $(top_srcdir)/usr/include >>> + >>>   $(OUTPUT)/true: true.c >>>       $(LINK.c) $< $(LDLIBS) -o $@ -static >>>   -$(OUTPUT)/%_test: %_test.c ../kselftest_harness.h common.h >>> -    $(LINK.c) $< $(LDLIBS) -o $@ -lcap >>> +$(OUTPUT)/%_test: %_test.c $(khdr_dir)/linux/landlock.h ../kselftest_harness.h common.h >>> +    $(LINK.c) $< $(LDLIBS) -o $@ -lcap -I$(khdr_dir) >