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: 148291 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:254a:b0:403:3b70:6f57 with SMTP id hf10csp106338vqb; Wed, 4 Oct 2023 05:48:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEgUqNzdOVpUbH0j8YICPSzTbqlHbn+VGostecELHvX9rqhJpeb7KlgT+gSlRk1qEgUjZfu X-Received: by 2002:a05:6a00:1805:b0:68e:487c:c4b7 with SMTP id y5-20020a056a00180500b0068e487cc4b7mr2596277pfa.11.1696423738507; Wed, 04 Oct 2023 05:48:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696423738; cv=none; d=google.com; s=arc-20160816; b=KPoxtmE2z6L2oXLAlV309pMxSRhXQRXNnoZIa2FI/XPfmTMfFqqjy9uDK0mwCzeKua 2c7IjWstsjrTeQBDkzys397gt0JWfJulYNOwSedLynZsz9fyNCVfA81lZYelpfWeKTtn wrx1uilYIYqA3TugqHloTqCyUTd0p5syCuRSKOGTxxzglcqtdeKdQ6dG+6FZI1mtsLX+ w13NyRiPrHw/TkkkPklq+uS6TNBODG2FUg2Kfjy2csW/K1NhHIN1UsMN6aE4r7PWUR5h XOlcPUPTZDCQVX/NOiPpPSGqbw/Xkpq4uh3T2m78wqkgVk8Fwjc8d/T9spuDO0qRdW0l wCtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3NWl68uC3zdoMo5hS8kGghmA57NOhwPhwa4gMfHpshs=; fh=2l2Pj/3AjLcQ1MeOjzN0dPVkgGCjgO6oWLeAwBJm39w=; b=NwgG96EefZHfV52pbdLGodVTtvZ5C6pSkTjl4zNijgWRFSFHwoG124RQCl91JQegNQ SGzVyrAk6XQfjSBiR44363Zj0VdmgovL73Lsx74a9PlTDKk4vgI9W36qGtQ6uHcFm3Av 8SWhSvzRa4jOcS2sXoL4I8c2HZdMkTrPvr0Dd+zbojVQuy95SduEWsjl8CTWj34MqHFo 09rpBh0tChF22DmhdoJCFDLzGFl3i1G/oUFIZZUkULLeP01KletT7YCpaLCaSMgwP5Co B56a+jx+O8wHJ89Ay1pupU40YQrqMAbC2yOAneIPifJST/yko6uH9q2tfWJQBtgMRwHq AWgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L4uwjBuk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id k16-20020a637b50000000b00573fdbc93c0si3870432pgn.892.2023.10.04.05.48.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Oct 2023 05:48:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L4uwjBuk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id DD19D8348D92; Wed, 4 Oct 2023 05:48:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242482AbjJDMsy (ORCPT + 18 others); Wed, 4 Oct 2023 08:48:54 -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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 04 Oct 2023 05:48:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778829218238247711 X-GMAIL-MSGID: 1778829218238247711 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 # ---------------------------------------------------------------------------