From patchwork Fri Aug 10 08:50:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10562471 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9313C1057 for ; Fri, 10 Aug 2018 08:50:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 808FF2B7C5 for ; Fri, 10 Aug 2018 08:50:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7ECED2B82A; Fri, 10 Aug 2018 08:50:39 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D79A2B829 for ; Fri, 10 Aug 2018 08:50:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727539AbeHJLTd (ORCPT ); Fri, 10 Aug 2018 07:19:33 -0400 Received: from mail-yw1-f67.google.com ([209.85.161.67]:35326 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726997AbeHJLTd (ORCPT ); Fri, 10 Aug 2018 07:19:33 -0400 Received: by mail-yw1-f67.google.com with SMTP id s68-v6so8049049ywg.2 for ; Fri, 10 Aug 2018 01:50:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:from:date:message-id:subject:to:cc; bh=sVFUMO7Z7hH+9r3JeVXmIA3sxb/zzjzV9+WmUH8iT48=; b=DQqxGV8zo87rPpiDuih7ClA9Rj/CB87ooxcw94a9RKDMJ+fYHoLZrNsX02QMd5Qpq4 Aa/S6wIG+zNBcvsajAGTHp+4jmwjWHPCHQ/CH6ZFN5GvRaqoqlwMQ73pJ4fHT7xPHZdP CdnuaXnISqrYpunsc7BoOHG2J1HHBXo40elM8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to:cc; bh=sVFUMO7Z7hH+9r3JeVXmIA3sxb/zzjzV9+WmUH8iT48=; b=m2T2V5NhlpOe1e5beWN/9Vx7lm2/xvOKYwadzB2atyOkDCpHbNO+DLxlrDSg86uEdO Z8zaORi0EiNaGEqu7JapAdwH2FIyQ2ZlYNXZeuAetDx+pWoMWfLP938wZkY2wvVItRLo M6+W1P4+JNjwExOdUhkrN0sxWt2gOp1vOUOBJPUbI92WJ7rCo+321F0SmD5BoDhUMro5 9K01zf/Tjf1oyIvwNVMbdRwpPW4D/9k77v7LKa3I1Vdg3jwYKBeZzHzSUGb60uu/uo7v H1XfKd9mb9GteSuddriMc8tkl+pPYR5i9NaJfVJGoNp4aLT4zPBRMp0VM3FCuT8EunT/ 13SQ== X-Gm-Message-State: AOUpUlHKJM8IOQSuUb8AmlrzDITlwNyxr3O+r+ioN/g5UBJAfuxEMdDG re1zHqO9oxlBnpqathtu8gp5ZimPV+UQ/bZKRRu89NYGIsixJQ== X-Google-Smtp-Source: AA+uWPwE2OdPLT32QXf6ZR8SQu7OGdi+RH0G+84fTBQ0yk3Mfn7SRPch4v28oC5RUoB2t3ZeyOfTia/9gBV2XhGMOTY= X-Received: by 2002:a81:3d08:: with SMTP id k8-v6mr2953725ywa.393.1533891037828; Fri, 10 Aug 2018 01:50:37 -0700 (PDT) MIME-Version: 1.0 From: Anders Roxell Date: Fri, 10 Aug 2018 10:50:26 +0200 Message-ID: Subject: kselftest-merge misses config's to merge To: Shuah Khan Cc: "open list:KERNEL SELFTEST FRAMEWORK" Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Hi, I have a question about the config files in tools/testing/selftests/ . The kselftest-merge target in the root Makefile assumes that the config files are placed in tools/testing/selftests/*/config and selftests/android/ion/config and selftests/net/forwarding/config doesn't follow that. So either we move those files up a level or do something like below in the top Makefile. # --------------------------------------------------------------------------- or do you have another way to solve this? Cheers, Anders diff --git a/Makefile b/Makefile index c88d56de7fda..06aeeca16917 100644 --- a/Makefile +++ b/Makefile @@ -1188,12 +1188,13 @@ PHONY += kselftest-clean kselftest-clean: $(Q)$(MAKE) -C $(srctree)/tools/testing/selftests clean +KSFT_CONFIGS=$(shell find $(srctree)/tools/testing/selftests/ -type f -name config) 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 + $(KSFT_CONFIGS) +$(Q)$(MAKE) -f $(srctree)/Makefile olddefconfig