From 5ef5c90e3cb3ae1ce7bebddaeb8e8f44309950f7 Mon Sep 17 00:00:00 2001 From: Jian Yang Date: Wed, 25 Mar 2020 13:32:07 -0700 Subject: [PATCH] selftests: move timestamping selftests to net folder For historical reasons, there are several timestamping selftest targets in selftests/networking/timestamping. Move them to the standard directory for networking tests: selftests/net. Signed-off-by: Jian Yang Acked-by: Willem de Bruijn Acked-by: Jakub Kicinski Signed-off-by: David S. Miller --- tools/testing/selftests/Makefile | 1 - tools/testing/selftests/net/.gitignore | 6 +++++- tools/testing/selftests/net/Makefile | 4 +++- tools/testing/selftests/net/config | 2 ++ .../timestamping => net}/hwtstamp_config.c | 0 .../{networking/timestamping => net}/rxtimestamp.c | 0 .../{networking/timestamping => net}/timestamping.c | 0 .../{networking/timestamping => net}/txtimestamp.c | 0 .../{networking/timestamping => net}/txtimestamp.sh | 2 +- .../selftests/networking/timestamping/.gitignore | 4 ---- .../selftests/networking/timestamping/Makefile | 11 ----------- .../testing/selftests/networking/timestamping/config | 2 -- 12 files changed, 11 insertions(+), 21 deletions(-) rename tools/testing/selftests/{networking/timestamping => net}/hwtstamp_config.c (100%) rename tools/testing/selftests/{networking/timestamping => net}/rxtimestamp.c (100%) rename tools/testing/selftests/{networking/timestamping => net}/timestamping.c (100%) rename tools/testing/selftests/{networking/timestamping => net}/txtimestamp.c (100%) rename tools/testing/selftests/{networking/timestamping => net}/txtimestamp.sh (98%) delete mode 100644 tools/testing/selftests/networking/timestamping/.gitignore delete mode 100644 tools/testing/selftests/networking/timestamping/Makefile delete mode 100644 tools/testing/selftests/networking/timestamping/config diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index b93fa645ee54..077818d0197f 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -36,7 +36,6 @@ TARGETS += net TARGETS += net/forwarding TARGETS += net/mptcp TARGETS += netfilter -TARGETS += networking/timestamping TARGETS += nsfs TARGETS += pidfd TARGETS += powerpc diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 91f9aea853b1..997c65dcad68 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -23,4 +23,8 @@ so_txtime tcp_fastopen_backup_key nettest fin_ack_lat -reuseaddr_ports_exhausted \ No newline at end of file +reuseaddr_ports_exhausted +hwtstamp_config +rxtimestamp +timestamping +txtimestamp diff --git a/tools/testing/selftests/net/Makefile b/tools/testing/selftests/net/Makefile index 24d8424010eb..3f386eb9e7d7 100644 --- a/tools/testing/selftests/net/Makefile +++ b/tools/testing/selftests/net/Makefile @@ -15,6 +15,7 @@ TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh TEST_PROGS += altnames.sh icmp_redirect.sh ip6_gre_headroom.sh TEST_PROGS += route_localnet.sh TEST_PROGS += reuseaddr_ports_exhausted.sh +TEST_PROGS += txtimestamp.sh TEST_PROGS_EXTENDED := in_netns.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any @@ -23,9 +24,10 @@ TEST_GEN_FILES += udpgso udpgso_bench_tx udpgso_bench_rx ip_defrag TEST_GEN_FILES += so_txtime ipv6_flowlabel ipv6_flowlabel_mgr TEST_GEN_FILES += tcp_fastopen_backup_key TEST_GEN_FILES += fin_ack_lat +TEST_GEN_FILES += reuseaddr_ports_exhausted +TEST_GEN_FILES += hwtstamp_config rxtimestamp timestamping txtimestamp TEST_GEN_PROGS = reuseport_bpf reuseport_bpf_cpu reuseport_bpf_numa TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls -TEST_GEN_FILES += reuseaddr_ports_exhausted KSFT_KHDR_INSTALL := 1 include ../lib.mk diff --git a/tools/testing/selftests/net/config b/tools/testing/selftests/net/config index b8503a8119b0..3b42c06b5985 100644 --- a/tools/testing/selftests/net/config +++ b/tools/testing/selftests/net/config @@ -12,6 +12,7 @@ CONFIG_IPV6_VTI=y CONFIG_DUMMY=y CONFIG_BRIDGE=y CONFIG_VLAN_8021Q=y +CONFIG_IFB=y CONFIG_NETFILTER=y CONFIG_NETFILTER_ADVANCED=y CONFIG_NF_CONNTRACK=m @@ -27,5 +28,6 @@ CONFIG_NFT_CHAIN_NAT_IPV6=m CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_NETEM=y CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_KALLSYMS=y diff --git a/tools/testing/selftests/networking/timestamping/hwtstamp_config.c b/tools/testing/selftests/net/hwtstamp_config.c similarity index 100% rename from tools/testing/selftests/networking/timestamping/hwtstamp_config.c rename to tools/testing/selftests/net/hwtstamp_config.c diff --git a/tools/testing/selftests/networking/timestamping/rxtimestamp.c b/tools/testing/selftests/net/rxtimestamp.c similarity index 100% rename from tools/testing/selftests/networking/timestamping/rxtimestamp.c rename to tools/testing/selftests/net/rxtimestamp.c diff --git a/tools/testing/selftests/networking/timestamping/timestamping.c b/tools/testing/selftests/net/timestamping.c similarity index 100% rename from tools/testing/selftests/networking/timestamping/timestamping.c rename to tools/testing/selftests/net/timestamping.c diff --git a/tools/testing/selftests/networking/timestamping/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c similarity index 100% rename from tools/testing/selftests/networking/timestamping/txtimestamp.c rename to tools/testing/selftests/net/txtimestamp.c diff --git a/tools/testing/selftests/networking/timestamping/txtimestamp.sh b/tools/testing/selftests/net/txtimestamp.sh similarity index 98% rename from tools/testing/selftests/networking/timestamping/txtimestamp.sh rename to tools/testing/selftests/net/txtimestamp.sh index 70a8cda7fd53..eea6f5193693 100755 --- a/tools/testing/selftests/networking/timestamping/txtimestamp.sh +++ b/tools/testing/selftests/net/txtimestamp.sh @@ -76,7 +76,7 @@ main() { } if [[ "$(ip netns identify)" == "root" ]]; then - ../../net/in_netns.sh $0 $@ + ./in_netns.sh $0 $@ else main $@ fi diff --git a/tools/testing/selftests/networking/timestamping/.gitignore b/tools/testing/selftests/networking/timestamping/.gitignore deleted file mode 100644 index d9355035e746..000000000000 --- a/tools/testing/selftests/networking/timestamping/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -timestamping -rxtimestamp -txtimestamp -hwtstamp_config diff --git a/tools/testing/selftests/networking/timestamping/Makefile b/tools/testing/selftests/networking/timestamping/Makefile deleted file mode 100644 index 1de8bd8ccf5d..000000000000 --- a/tools/testing/selftests/networking/timestamping/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -CFLAGS += -I../../../../../usr/include - -TEST_GEN_FILES := hwtstamp_config rxtimestamp timestamping txtimestamp -TEST_PROGS := txtimestamp.sh - -all: $(TEST_PROGS) - -top_srcdir = ../../../../.. -KSFT_KHDR_INSTALL := 1 -include ../../lib.mk diff --git a/tools/testing/selftests/networking/timestamping/config b/tools/testing/selftests/networking/timestamping/config deleted file mode 100644 index a13e3169b0a4..000000000000 --- a/tools/testing/selftests/networking/timestamping/config +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_IFB=y -CONFIG_NET_SCH_NETEM=y -- 2.49.0