From patchwork Mon May 20 15:16:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Rue X-Patchwork-Id: 164653 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp416997ili; Mon, 20 May 2019 08:19:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoTK5Z4G0+gj9pkVS8StlluwnG68KuhYTtGksUBNUmP5yd9P4XBGbsGZxXCGNKzCqDqPL9 X-Received: by 2002:a17:902:fa2:: with SMTP id 31mr77922637plz.128.1558365542310; Mon, 20 May 2019 08:19:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558365542; cv=none; d=google.com; s=arc-20160816; b=pFIy1Y8lSW9YRZc6hKqcnCJWZqfpBHIa5LaqRm3md8wdBLpD/O50Pa0jK3hxvy0KQO IoauHYCDLh4kMPZINAH1f3DKrBZ6e801YU8UOUjiWuCqzfjJgHL1Euvloc6LEeaSLhV9 hwcWAu5rz+tvMa+TaoreQmo3kKexmzW/K0eUaTS88cYpTG2eWX7zalX/QAznDMDvLUvN 7Ggmq6aGKAWMWuy0xvOoOIAVEOjT6WbzO24FkW9K1y2rCJZ7WAwyDll/fGNkM/SeuRXT 5Dq8HVZ4xxEfY4uIxomsYjL09lRrAkyTUG2UovPm8w4l7iDehBy3ZofOv05N8yWIjht7 C2oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=8bDPOW4T9PERtlCKjJ2lAbrC2Btl/gUnBtJeF4+SdEo=; b=ZiJT5FFMmfE3JEZnq+CZoVcOBzGeAHa6yZ7bAIcf5DblCGFzXwQsow3JWU32y3mTsg 404ljVuofch2LcZOoJF/2abo/h5QK2CGAjy5FlgoF1gMAJHEhwG54L5ehBSNhODzQG05 g0vLwjG/nGR7EeU7Gu3zIYxMPw8XtcynjcctGSzmT/+kqjK3KHaJSalAz6fJZoByDuoz tpraNZ4Tm/FldUXU4Syf8iknmshS83NHYPHxEw/34IeLel7CgI47NBmq/WsS/0NJsnv7 IszXf/gOUxbrPo+czq7nV3+uTpQq9m/QhwN8hec0p9ltiiBstol35fiFmSo2uvSJ0HwP PxuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M2FGtec4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v20si17807811pgn.266.2019.05.20.08.19.02; Mon, 20 May 2019 08:19:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=M2FGtec4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390130AbfETPTA (ORCPT + 30 others); Mon, 20 May 2019 11:19:00 -0400 Received: from mail-it1-f196.google.com ([209.85.166.196]:54170 "EHLO mail-it1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388745AbfETPTA (ORCPT ); Mon, 20 May 2019 11:19:00 -0400 Received: by mail-it1-f196.google.com with SMTP id m141so23506744ita.3 for ; Mon, 20 May 2019 08:18:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8bDPOW4T9PERtlCKjJ2lAbrC2Btl/gUnBtJeF4+SdEo=; b=M2FGtec4qwOQA9nWt3yNJamKQbZ6wWHEdQ7BldBsOi2SLF2pp3o3HgjfWthzjXcrkt 1Hs+/DfFdQxqw0ItBC68YwvtUHfxSDPNMNLezriKfz417YqyxPA0xE315PCzAR3zfJwq sD4QG6ggCau9zHe06mjOfQ/XeYTExSpjEdqb9EfyT8q9xhCfiXdOI7D/5lD6jYqoWhyC KCI0lBwpSXxLHBGlYkTxZ182lmZPVwPKZjKhBCHRAF5RLHL/2mIcGf0eGvTbEPMZTbFy lRnLGTe/ufItgUvJSnsswcjufkJZChaO2cCIaWAhfiTpiBkCBx5/xWGe0JLXpAVpwW/L XZBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=8bDPOW4T9PERtlCKjJ2lAbrC2Btl/gUnBtJeF4+SdEo=; b=T2SoqZALk7iVNH/eh34uoLdCulkXv2YtUfTz2hiVlyjLC74WCIxQCo5L5p/VTNan0W Jv9Zh59cm2FJEHZ1xR/uRBoX7tdUwPGNslequQ+nEbZBUdREFr4LideZ37Fg3qbjfoBz 36bGzAgVEGtLMV7IE6nj+q6oB/coAQJD6A6wEYbWG/3J7sBRs8043z80bW/nsf7rmRRw AP37WBAoKVF/5ig/om0DVWcgiqp9/3tjavRp3Ib+YScR+DZ8YLXp7FEyFcezEFz/7dR3 oQKbC8jjifwC6U3i2cyqB4n8h80ArsMDHrwT7DvntMFrV/lrSOJz/8TIaEd6UJR6GpGe f5oA== X-Gm-Message-State: APjAAAXEaogU8HMlcgkrk1saXOdgOMAlN6wM6jnMCAjc60RMdHPJ+x/Y qf73I92cwkkLlI8to4fXMxHuJA== X-Received: by 2002:a05:660c:107:: with SMTP id w7mr11276557itj.59.1558365539219; Mon, 20 May 2019 08:18:59 -0700 (PDT) Received: from localhost (c-75-72-120-115.hsd1.mn.comcast.net. [75.72.120.115]) by smtp.gmail.com with ESMTPSA id s8sm5513436iot.55.2019.05.20.08.18.58 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 20 May 2019 08:18:58 -0700 (PDT) From: Dan Rue To: dan.rue@linaro.org Cc: linux-kselftest@vger.kernel.org, Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: teach kselftest-merge to find nested config files Date: Mon, 20 May 2019 10:16:14 -0500 Message-Id: <20190520151614.19188-1-dan.rue@linaro.org> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Current implementation of kselftest-merge only finds config files that are one level deep using `$(srctree)/tools/testing/selftests/*/config`. Often, config files are added in nested directories, and do not get picked up by kselftest-merge. Use `find` to catch all config files under `$(srctree)/tools/testing/selftests` instead. Signed-off-by: Dan Rue --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.21.0 diff --git a/Makefile b/Makefile index a45f84a7e811..e99e7f9484af 100644 --- a/Makefile +++ b/Makefile @@ -1228,9 +1228,8 @@ kselftest-clean: PHONY += kselftest-merge kselftest-merge: $(if $(wildcard $(objtree)/.config),, $(error No .config exists, config your kernel first!)) - $(Q)$(CONFIG_SHELL) $(srctree)/scripts/kconfig/merge_config.sh \ - -m $(objtree)/.config \ - $(srctree)/tools/testing/selftests/*/config + $(Q)find $(srctree)/tools/testing/selftests -name config | \ + xargs $(srctree)/scripts/kconfig/merge_config.sh -m $(objtree)/.config +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig # ---------------------------------------------------------------------------