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 X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87198C04E87 for ; Mon, 20 May 2019 17:56:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 64D9320863 for ; Mon, 20 May 2019 17:56:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558375007; bh=vcJUwKueu3F2uwVm18g8UcTZp0tXVBXVM4e5zvCz3Dc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=Bkn7wpCs6zv111/D/MzrtyEp5yNPES+HMmAFjg1OJIZysqk9aIuH0lLCrI3l+Hraf zckBecmwY8u1avnJMl+pa1YgjSpIg3ujVaHzt1S4ap8w24Nu7/TBmP8bUFMBGcZX4B gmBb52u9uRjKy0USV4HLh4wx8HosmiAgQ8tjjGWM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727004AbfETR4q (ORCPT ); Mon, 20 May 2019 13:56:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:52098 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726820AbfETR4p (ORCPT ); Mon, 20 May 2019 13:56:45 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2C16F206B6; Mon, 20 May 2019 17:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558375004; bh=vcJUwKueu3F2uwVm18g8UcTZp0tXVBXVM4e5zvCz3Dc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=pLnYbJ/k9saVg+oNGkcODh4Aicjj8nC9e8UFtYjKy5RJlYtIHZ7VzozwEMhcQ9WOR OHffZAJ5XVEYyChLiCCFBddKrw7q9vBYGYnKZzQEjTnhw1OoBCCXY/nsLTo0G/UdH8 9NBihMUROvwJP0JSi0ZueO7/fuL//+L582whwNII= Date: Mon, 20 May 2019 19:56:41 +0200 From: Greg KH To: Dan Rue Cc: linux-kselftest@vger.kernel.org, Masahiro Yamada , Michal Marek , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] kbuild: teach kselftest-merge to find nested config files Message-ID: <20190520175641.GA14339@kroah.com> References: <20190520151614.19188-1-dan.rue@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190520151614.19188-1-dan.rue@linaro.org> User-Agent: Mutt/1.11.4 (2019-03-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, May 20, 2019 at 10:16:14AM -0500, Dan Rue wrote: > 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(-) To be more specific here, the binderfs test is not catching the config entry, so it would be nice to get this into the stable trees as well :) > 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 > > # --------------------------------------------------------------------------- is find run with $(Q)? It isn't with other instances in the Makefile. thanks, greg k-h