From patchwork Thu Feb 22 11:53:07 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zong Li X-Patchwork-Id: 10235277 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E0D260349 for ; Thu, 22 Feb 2018 11:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CAAC28BC1 for ; Thu, 22 Feb 2018 11:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F62628BC7; Thu, 22 Feb 2018 11:54:51 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI autolearn=unavailable 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 CE75928BC1 for ; Thu, 22 Feb 2018 11:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753729AbeBVLyd (ORCPT ); Thu, 22 Feb 2018 06:54:33 -0500 Received: from mail-pl0-f65.google.com ([209.85.160.65]:43781 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753649AbeBVLyb (ORCPT ); Thu, 22 Feb 2018 06:54:31 -0500 Received: by mail-pl0-f65.google.com with SMTP id f23so2743625plr.10; Thu, 22 Feb 2018 03:54:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=HCnxfWoWi8jw80/2C3u+5ZHzj/UrZgLBZ58UQ0PIzGU=; b=l+wBA2hxl4LlN50A6OmwMNmB5fOZgs+xu64LaRDmUh0vXLE1qjBEjvq/GEGQSRwQc1 hfwqenb3S0ksSkZadt2JT38rEfEIat2fQIUvdnG9l8RE22XGPSFLCjvN3vzTkOcFnyIJ FbAFWLEgKtURavX+ur1Vw7GXGE9KJyvXVj5Kyi9Uk0lBkHoYKz7duweQ9MQDUKwrag4k mosW9YuErmgE3csF4l2i1yzwfRqrBWvQoVorH1iDUrY8jJStV1ywiWdZ7XlLLIOggUJ9 1EqY2Zqb6i3bdd2trIYQ2VM8HfZ9Qzh00g+q+cAo7ZFM5b32g62+qu06gVqDN8FoqZWJ xZFg== 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; bh=HCnxfWoWi8jw80/2C3u+5ZHzj/UrZgLBZ58UQ0PIzGU=; b=LvOUJh2EIwdvo8LdOa8o145GTZTzoQ9KB+VFE27GYPR0hhXIj4yQIqE76yXJyMOBPh kgIEvEStBq0MJC0N65HfaQ0VhC8tU5j4A+kNNJbFt8ICTyGk/txldSom1VZkG/kPMcJK tdlT8ROTl8qTnGmwh34oYqN0suzK8qAtDqLm7ipWjCSUas+z/43VEv5bOJGwxukLxYTc 6bbqTLsY/Ddajy41JOjTjItEeVbzo0VlzDFxqPkVxk7xDSx5X3Se5kq4JdawOIWawu8v ofBeDkwo9DUZkRmZL7aiz9SS4sy2QnD3pV2Y9vVNbtss8t4iboMzDC39ojFmAtsRUynV 8E0w== X-Gm-Message-State: APf1xPCEOeS1C5kKHSRHdToLVlzpurNRfl6y7Hlk/B+Ki2kZ/hwTxeU2 nGTMq4fE1uk4BZkJ/6W007s= X-Google-Smtp-Source: AH8x225PFXuSLatuV6sH8OZCn3hgemeSArtFARNOk7JsvXmwYbhu5jzd4bGMr4WOIGZIqTdjp6zQDw== X-Received: by 2002:a17:902:9a8a:: with SMTP id w10-v6mr6305367plp.201.1519300471196; Thu, 22 Feb 2018 03:54:31 -0800 (PST) Received: from app09.andestech.com ([118.163.51.199]) by smtp.gmail.com with ESMTPSA id s127sm20183050pfb.178.2018.02.22.03.54.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Feb 2018 03:54:30 -0800 (PST) From: Zong Li To: shuah@kernel.org, vincent.legoll@gmail.com, ast@kernel.org, daniel@iogearbox.net, mcgrof@kernel.org, davem@davemloft.net, keescook@chromium.org, fathi.boudra@linaro.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: zong@andestech.com, greentime@andestech.com, Zong Li Subject: [PATCH] selftest: fix kselftest-merge depend on 'RUNTIME_TESTING_MENU' Date: Thu, 22 Feb 2018 19:53:07 +0800 Message-Id: <20180222115307.15063-1-zongbox@gmail.com> X-Mailer: git-send-email 2.16.1 Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the 'commit d3deafaa8b5c ("lib/: make RUNTIME_TESTS a menuconfig to ease disabling it all")', the make kselftest-merge cannot merge the config dependencies of kselftest to the existing .config file. These config dependencies of kselftest need to enable the 'CONFIG_RUNTIME_TESTING_MENU=y' at the same time. Signed-off-by: Zong Li Cc: Greentime Hu --- tools/testing/selftests/bpf/config | 1 + tools/testing/selftests/firmware/config | 1 + tools/testing/selftests/kmod/config | 1 + tools/testing/selftests/lib/config | 1 + tools/testing/selftests/net/config | 1 + tools/testing/selftests/static_keys/config | 1 + tools/testing/selftests/sysctl/config | 1 + tools/testing/selftests/user/config | 1 + 8 files changed, 8 insertions(+) diff --git a/tools/testing/selftests/bpf/config b/tools/testing/selftests/bpf/config index 983dd25d49f4..d93b82144b19 100644 --- a/tools/testing/selftests/bpf/config +++ b/tools/testing/selftests/bpf/config @@ -1,3 +1,4 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_NET_CLS_BPF=m diff --git a/tools/testing/selftests/firmware/config b/tools/testing/selftests/firmware/config index c8137f70e291..01d7445ef007 100644 --- a/tools/testing/selftests/firmware/config +++ b/tools/testing/selftests/firmware/config @@ -1 +1,2 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_FIRMWARE=y diff --git a/tools/testing/selftests/kmod/config b/tools/testing/selftests/kmod/config index 259f4fd6b5e2..37070985e428 100644 --- a/tools/testing/selftests/kmod/config +++ b/tools/testing/selftests/kmod/config @@ -1,3 +1,4 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_KMOD=m CONFIG_TEST_LKM=m CONFIG_XFS_FS=m diff --git a/tools/testing/selftests/lib/config b/tools/testing/selftests/lib/config index 126933bcc950..d1fe14c2c8cb 100644 --- a/tools/testing/selftests/lib/config +++ b/tools/testing/selftests/lib/config @@ -1,3 +1,4 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_PRINTF=m CONFIG_TEST_BITMAP=m CONFIG_PRIME_NUMBERS=m diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index 7177bea1fdfa..847a99873128 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -1,3 +1,4 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_USER_NS=y CONFIG_BPF_SYSCALL=y CONFIG_TEST_BPF=m diff --git a/tools/testing/selftests/static_keys/config b/tools/testing/selftests/static_keys/config index d538fb774b96..732d17f6b9a1 100644 --- a/tools/testing/selftests/static_keys/config +++ b/tools/testing/selftests/static_keys/config @@ -1 +1,2 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_STATIC_KEYS=m diff --git a/tools/testing/selftests/sysctl/config b/tools/testing/selftests/sysctl/config index 6ca14800d755..772ce8c3c0d9 100644 --- a/tools/testing/selftests/sysctl/config +++ b/tools/testing/selftests/sysctl/config @@ -1 +1,2 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_SYSCTL=y diff --git a/tools/testing/selftests/user/config b/tools/testing/selftests/user/config index 784ed8416324..f9f491fa4ae8 100644 --- a/tools/testing/selftests/user/config +++ b/tools/testing/selftests/user/config @@ -1 +1,2 @@ +CONFIG_RUNTIME_TESTING_MENU=y CONFIG_TEST_USER_COPY=m