From patchwork Wed Oct 4 12:48:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 13408721 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 49392E7B60C for ; Wed, 4 Oct 2023 12:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242510AbjJDMsx (ORCPT ); Wed, 4 Oct 2023 08:48:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242492AbjJDMsv (ORCPT ); Wed, 4 Oct 2023 08:48:51 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E15E7C4; Wed, 4 Oct 2023 05:48:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D12F5C433C7; Wed, 4 Oct 2023 12:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696423726; bh=tDwOoIJ/B2p6zbJHMaqLiy/PTVxQiTe4yPxgshPYk9A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L4uwjBukmVUGsEbMlX3f/oNaINq7CZiCraPRbLyVM9PS7UUToiaWhDIPmjRBEDw0k 7jNADEE4nVQwHp4tG+0PQozeKDGX7JebR6NBird+eR7p6fpD8c8o3EwUsXa0kUJA5r wnNLBgsUkVkyquQdtPcQt+fystj9PkXA2nv6j6UOIF2bpmf/KSbsA1nHKxt3qG7wlL CpJVzu8VRItV5Z5ZU9gQ1/ZRnjNPodeEda8ycNNV5jW/axwK06E/4CNQZi7hIZp7C+ cFJADpOZ8Bs6RcPp3FQvdyMWfLIpg4vF7mbXhvN10LabFORCvE2VaWmgxc6gsEaMkT 5FdZjwTCzquZw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org, Shuah Khan Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 1/2] kbuild: Let builtin have precedence over modules for kselftest-merge Date: Wed, 4 Oct 2023 14:48:36 +0200 Message-Id: <20231004124837.56536-2-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004124837.56536-1-bjorn@kernel.org> References: <20231004124837.56536-1-bjorn@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Björn Töpel The kselftest-merge target walks all kselftests configs, and merges them. However, builtin does not have precedence over modules. This breaks some of the tests, e.g.: $ grep CONFIG_NF_NAT tools/testing/selftests/{bpf,net}/config tools/testing/selftests/bpf/config:CONFIG_NF_NAT=y tools/testing/selftests/net/config:CONFIG_NF_NAT=m Here, the net config will set NF_NAT to module, which makes it clunky to run the BPF tests. Add '-y' to scripts/kconfig/merge_config.sh. Signed-off-by: Björn Töpel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 373649c7374e..170fb2f5e378 100644 --- a/Makefile +++ b/Makefile @@ -1368,7 +1368,7 @@ PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) $(Q)find $(srctree)/tools/testing/selftests -name config | \ - xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config + xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig # --------------------------------------------------------------------------- From patchwork Wed Oct 4 12:48:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= X-Patchwork-Id: 13408722 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 D27A7E7B60D for ; Wed, 4 Oct 2023 12:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242515AbjJDMsy (ORCPT ); Wed, 4 Oct 2023 08:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242491AbjJDMsw (ORCPT ); Wed, 4 Oct 2023 08:48:52 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1335693; Wed, 4 Oct 2023 05:48:49 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 00C65C433C9; Wed, 4 Oct 2023 12:48:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696423728; bh=GCXPtG2gS4xIl3E4smfsoQMIyJon1TmicxEyAyK0wVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cXzreQBMuuF74CBgHzSwEN2XP6h0oZD0m2xCM0zXXfhTbBayi7b7BfShjv/w/GuwX dcleLXW/kTjBlrlwrCkSAwOnrkrUMQ8ZPR+MPv8maO0c5cpLYMSxcSCA3hTnnBG3fx FpSawKI8+A2WhDqTGl1Sqqb7u0eQJa82fgEHccU6kdfKq3uCPVskQmzIqGFrXPeZgE Tl0+U0BvwXOvIl0LC2W7igEasQ2LnMESCOjarMQOSEaItwmZXGox9RenhfWE5waGQq 5Bys358TN2G57KT8cRrUbO9E8U3MPS1t45ikV712Dys5mBOly9cdjewrOSjsULg9Zv VWHL+PeaBg7Hw== From: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org, Shuah Khan Cc: =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , bpf@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH 2/2] kbuild: Merge per-arch config for kselftest-merge target Date: Wed, 4 Oct 2023 14:48:37 +0200 Message-Id: <20231004124837.56536-3-bjorn@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231004124837.56536-1-bjorn@kernel.org> References: <20231004124837.56536-1-bjorn@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org From: Björn Töpel Some kselftests has a per-arch config, e.g. tools/testing/selftests/bpf/config.s390x. Make sure these configs are picked up by the kselftest-merge target. Signed-off-by: Björn Töpel --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 170fb2f5e378..0303acb311cc 100644 --- a/Makefile +++ b/Makefile @@ -1367,7 +1367,7 @@ kselftest-%: headers FORCE PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)find $(srctree)/tools/testing/selftests -name config | \ + $(Q)find $(srctree)/tools/testing/selftests -name config -o -name config.$(UTS_MACHINE) | \ xargs $(srctree)/scripts/kconfig/merge_config.sh -y -m $(objtree)/.config $(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig