selftests: move timestamping selftests to net folder
Subsystems (4)
PATCH 1/1 selftests: move timestamping selftests to net folder
From: Jian Yang <[email protected]>
For historical reasons, there are several timestamping selftest targets in selftests/networking/timestamping. Move them to the standard directory for networking tests: selftests/net.
---
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/configtools/testing/selftests/Makefile +0 -1
@@ -35,7 +35,6 @@ TARGETS += mqueue TARGETS += net TARGETS += net/mptcp TARGETS += netfilter -TARGETS += networking/timestamping TARGETS += nsfs TARGETS += pidfd TARGETS += powerpc
tools/testing/selftests/net/.gitignore +5 -1
@@ -23,4 +23,8 @@ so_txtime tcp_fastopen_backup_key nettest fin_ack_lat -reuseaddr_ports_exhausted +reuseaddr_ports_exhausted +hwtstamp_config +rxtimestamp +timestamping +txtimestamp
tools/testing/selftests/net/Makefile +3 -1
@@ -13,6 +13,7 @@ TEST_PROGS += test_vxlan_fdb_changelink.sh so_txtime.sh ipv6_flowlabel.sh TEST_PROGS += tcp_fastopen_backup_key.sh fcnal-test.sh l2tp.sh traceroute.sh TEST_PROGS += fin_ack_lat.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
@@ -21,9 +22,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
tools/testing/selftests/net/config +2 -0
@@ -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
tools/testing/selftests/net/hwtstamp_config.c renamed from tools/testing/selftests/networking/timestamping/hwtstamp_config.c +0 -0
tools/testing/selftests/net/rxtimestamp.c renamed from tools/testing/selftests/networking/timestamping/rxtimestamp.c +0 -0
tools/testing/selftests/net/timestamping.c renamed from tools/testing/selftests/networking/timestamping/timestamping.c +0 -0
tools/testing/selftests/net/txtimestamp.c renamed from tools/testing/selftests/networking/timestamping/txtimestamp.c +0 -0
tools/testing/selftests/net/txtimestamp.sh renamed from tools/testing/selftests/networking/timestamping/txtimestamp.sh +1 -1
@@ -76,7 +76,7 @@ main() { } if [[ "$(ip netns identify)" == "root" ]]; then - ../../net/in_netns.sh $0 $@ + ./in_netns.sh $0 $@ else main $@ fi
tools/testing/selftests/networking/timestamping/.gitignore deleted +0 -4
@@ -1,4 +0,0 @@ -timestamping -rxtimestamp -txtimestamp -hwtstamp_config
tools/testing/selftests/networking/timestamping/Makefile deleted +0 -11
@@ -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
tools/testing/selftests/networking/timestamping/config deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_IFB=y -CONFIG_NET_SCH_NETEM=y
Signature · 1 line
2.25.1.696.g5e7596f4ac-goog
Quoted 8 lines · On Wed, 25 Mar 2020 13:32:07 -0700 Jian Yang wrote:
From: Jian Yang <[email protected]>
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 <[email protected]>Acked-by Willem de Bruijn <[email protected]>
Thank you!
From: Jian Yang <[email protected]>
Date: Wed, 25 Mar 2020 13:32:07 -0700
Quoted 8 lines
From: Jian Yang <[email protected]>
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 <[email protected]>Acked-by Willem de Bruijn <[email protected]>
Applied, thanks.