From patchwork Tue Aug 21 16:12:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anders Roxell X-Patchwork-Id: 10572013 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 EF226921 for ; Tue, 21 Aug 2018 16:12:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DB4F82AB76 for ; Tue, 21 Aug 2018 16:12:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CF5EC2AB5E; Tue, 21 Aug 2018 16:12:26 +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 647062AB2B for ; Tue, 21 Aug 2018 16:12:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728303AbeHUTdE (ORCPT ); Tue, 21 Aug 2018 15:33:04 -0400 Received: from mail-lf1-f68.google.com ([209.85.167.68]:39441 "EHLO mail-lf1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728269AbeHUTdE (ORCPT ); Tue, 21 Aug 2018 15:33:04 -0400 Received: by mail-lf1-f68.google.com with SMTP id j201-v6so2737956lfg.6 for ; Tue, 21 Aug 2018 09:12:18 -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; bh=ejxToLkjmh4kxvoC43HtWFI56ySraISwQDXewSpr1jY=; b=IkRO0bRqI11r3WwMD2Dq6envhpiJjG0qn00AOppQqjZahStkl3B5nEeFgYkDr+MV4F 7RLYTc5a+GD9n0IQleYFMXeIoVM6soYNbIKMEyhrKf/dVBRzr4cynX7qw9dnjeBAoRVW VQiZEzUGXPUpgqRSJ9Bl+6ChKDXt1gV+A9vH0= 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=ejxToLkjmh4kxvoC43HtWFI56ySraISwQDXewSpr1jY=; b=eB0W+28KrJ0eLdw0hHILtvrzbUD5eSCsJEUBLGDpdsVvReO8n7y/1l8DmhZBAPc8qX LZsy/+pjD5gHNsZlszKoolgTEAVmwNw7waO8UZCTdaTwt4PPQ5dowj1zamB8IG39obSF qxaU1hyTrNFlnL2tve2IL6zMfZeCwXMv+oGhr7IoXEbtRnaXQzFGi6fpyiGd29iWQb7e +L4xsoaoAkM7UDpNFeiIGijjdBvKV90dN70a1L/k20o4Tjy5eb1TwQAlS/g2icMt4XUW rsclx7avFMasely9lR3atVOXXxr0ZILhUuFv/bZQcnG6msLmLdw9EvYe0ywcjxfP8Cjh Xy9w== X-Gm-Message-State: AOUpUlEy2GS3aKqQpnUlhWI3qngkzbSYa6rBH9geJohwN19cWFeC+kpy jEMqt6/1ztsraoDq+h3cmIvT0Q== X-Google-Smtp-Source: AA+uWPyo7BWMsFjyjgFt/6KoQ6faWpcHfu8kG1imh6R/rfcAfcIbJ3nGK10rL02SntTYhAYzJiaoFQ== X-Received: by 2002:a19:9710:: with SMTP id z16-v6mr34562447lfd.17.1534867937292; Tue, 21 Aug 2018 09:12:17 -0700 (PDT) Received: from localhost (c-2c3d70d5.07-21-73746f28.bbcust.telenor.se. [213.112.61.44]) by smtp.gmail.com with ESMTPSA id g16-v6sm860667lfb.5.2018.08.21.09.12.16 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Aug 2018 09:12:16 -0700 (PDT) From: Anders Roxell To: davem@davemloft.net, shuah@kernel.org Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, Anders Roxell Subject: [PATCH] selftests: net: move fragment forwarding/config up a level Date: Tue, 21 Aug 2018 18:12:12 +0200 Message-Id: <20180821161212.5750-1-anders.roxell@linaro.org> X-Mailer: git-send-email 2.18.0 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 'make kselftest-merge' assumes that the config files for the tests are located under the 'main' tet dir, like tools/testing/selftests/net/ and not in a subdir to net. Signed-off-by: Anders Roxell Acked-by: Shuah Khan (Samsung OSG) --- tools/testing/selftests/net/config | 13 +++++++++---- tools/testing/selftests/net/forwarding/config | 12 ------------ 2 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 tools/testing/selftests/net/forwarding/config diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index cd3a2f1545b5..b344619b34f2 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -2,15 +2,20 @@ CONFIG_USER_NS=y CONFIG_BPF_SYSCALL=y CONFIG_TEST_BPF=m CONFIG_NUMA=y -CONFIG_NET_VRF=y +CONFIG_NET_VRF=m CONFIG_NET_L3_MASTER_DEV=y CONFIG_IPV6=y CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_VETH=y +CONFIG_VETH=m CONFIG_INET_XFRM_MODE_TUNNEL=y CONFIG_NET_IPVTI=y CONFIG_INET6_XFRM_MODE_TUNNEL=y CONFIG_IPV6_VTI=y CONFIG_DUMMY=y -CONFIG_BRIDGE=y -CONFIG_VLAN_8021Q=y +CONFIG_BRIDGE=m +CONFIG_VLAN_8021Q=m +CONFIG_CGROUP_BPF=y +CONFIG_NET_CLS_FLOWER=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_ACT_GACT=m +CONFIG_BRIDGE_VLAN_FILTERING=y diff --git a/tools/testing/selftests/net/forwarding/config b/tools/testing/selftests/net/forwarding/config deleted file mode 100644 index 5cd2aed97958..000000000000 --- a/tools/testing/selftests/net/forwarding/config +++ /dev/null @@ -1,12 +0,0 @@ -CONFIG_BRIDGE=m -CONFIG_VLAN_8021Q=m -CONFIG_BRIDGE_VLAN_FILTERING=y -CONFIG_NET_L3_MASTER_DEV=y -CONFIG_IPV6_MULTIPLE_TABLES=y -CONFIG_NET_VRF=m -CONFIG_BPF_SYSCALL=y -CONFIG_CGROUP_BPF=y -CONFIG_NET_CLS_FLOWER=m -CONFIG_NET_SCH_INGRESS=m -CONFIG_NET_ACT_GACT=m -CONFIG_VETH=m