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: 144743 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5464084ljj; Tue, 21 Aug 2018 09:12:21 -0700 (PDT) X-Google-Smtp-Source: AA+uWPwKa9ut94FutblHtxx34jnVlStZX6DGMaMpmENYTBVxYHZW6s4vx9hhXT/Z7RbL+WDtGmhK X-Received: by 2002:a17:902:7896:: with SMTP id q22-v6mr50179948pll.47.1534867941146; Tue, 21 Aug 2018 09:12:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534867941; cv=none; d=google.com; s=arc-20160816; b=A9uJ9C88qK2FYpdgyrs+rIZZlG+80CTSB5MuZMMvMrZPQUilXtSXb7TqejrZh6LxgY EBpJkcpbtlJufJswqdkY81t6V4jxLGuBIYEU5Cq6jOh44m/4IAf/JT7om/v5xHoXFz3H eppaJTheef1MRw+YgnBQ2Ubnt2n4SETURuui7jR0sd6dm/Cg2qWuUolwL9Myc/1CXWnd miR3vfFweK+N4n3nkEZMNhNCDf0BwlP6P/fNGE58FYv2BQRHgYeO2/MBthCzUNBtGxl4 4XbMFmrahhOnevED+DOE9J7VyhRxCNDmWIvZsCtHvsQ3jWf90ImilrIVEgqXuQEtDq0W NU8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=ejxToLkjmh4kxvoC43HtWFI56ySraISwQDXewSpr1jY=; b=SrCwE1V3CVaeDp2ZFU5nflCMn76z/U8ByPfn2sGSj83WrVYTTik7344LF21D0TMRXn Kmq5WddrwOZpKw5tLRKWJfXd78RAflW2dGwY+5hzf7TPSeYgAHJy00rGy5aE6S1BuRf4 o6L0NABgUiKFQBsiFEJQGLCJzPDWsHDFpMkkwW1Ji7RBDYQ9WqjCJw9P8aTTV+Hf/0nG FF4+5NsT9FqqgblfC+cw9mSDoHa+JySDBXLhDP6i8Dx1uHxhj/V8fEwRQMvYrfGhem5b 1wsQNMfdzUIHpbPCJ79vZ0OyttOTb9L+1fIVhl8mRHxv9K4MvUYnqS/F+GBKXcyF5e81 utyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IkRO0bRq; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l63-v6si6411033pgd.598.2018.08.21.09.12.20; Tue, 21 Aug 2018 09:12:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IkRO0bRq; spf=pass (google.com: best guess record for domain of netdev-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728269AbeHUTdE (ORCPT + 10 others); Tue, 21 Aug 2018 15:33:04 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:34642 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727618AbeHUTdE (ORCPT ); Tue, 21 Aug 2018 15:33:04 -0400 Received: by mail-lf1-f67.google.com with SMTP id g9-v6so8753360lfh.1 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=l7vRZ/fxdK/vZaErr3FXkmG9XRPvtkQCtZO6G9lRb1vaxklx1oTxy85qmIibEYc5yJ 82AlKvUj4nIvUwQMMjyetzix65Ma5HqK7gmif729NV0FvH8jAYUHxPr5Tqr7JVIASchh Jr1ayt/yvFP5kRxlIZGl5cvNLxiGvXHdqMDjboByxYesOwSaNIHHw+CWcJGf3QEoYyz3 Q3nJSE1Lz1k0YE4KsIplrLCn6PUTndKM/4GNKK03Y6LNahvn0xkCZ52w+uyMTtn4cGvO WSY3QIxXOgEnpUn4yCE/nSQcjbuUtnzzT+NfdrIk4JUSbWm+4YaR66cDjzFILqAANxwS 2skA== X-Gm-Message-State: AOUpUlFPhq6XL2EisHfgLLVtgoBQ6mkq5YMWA1HS71VtMg85BWUw7MKc Hn9LC91r1byWl+1gcEHGNX1jMw== 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org '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 --- 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 -- 2.18.0 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