From: Anders Roxell <anders.roxell@linaro.org>
To: davem@davemloft.net, shuah@kernel.org
Cc: linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
linux-kselftest@vger.kernel.org,
Anders Roxell <anders.roxell@linaro.org>
Subject: [PATCH] selftests: net: move fragment forwarding/config up a level
Date: Tue, 21 Aug 2018 18:12:12 +0200 [thread overview]
Message-ID: <20180821161212.5750-1-anders.roxell@linaro.org> (raw)
'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 <anders.roxell@linaro.org>
---
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
--
2.18.0
next reply other threads:[~2018-08-21 19:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-21 16:12 Anders Roxell [this message]
2018-08-21 18:56 ` [PATCH] selftests: net: move fragment forwarding/config up a level Ido Schimmel
2018-08-21 19:41 ` Shuah Khan
2018-08-22 6:45 ` Ido Schimmel
2018-08-23 17:09 ` Shuah Khan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180821161212.5750-1-anders.roxell@linaro.org \
--to=anders.roxell@linaro.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=shuah@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).