Commit 5ef5c90e authored by Jian Yang's avatar Jian Yang Committed by David S. Miller

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: default avatarJian Yang <jianyang@google.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b68480b
...@@ -36,7 +36,6 @@ TARGETS += net ...@@ -36,7 +36,6 @@ TARGETS += net
TARGETS += net/forwarding TARGETS += net/forwarding
TARGETS += net/mptcp TARGETS += net/mptcp
TARGETS += netfilter TARGETS += netfilter
TARGETS += networking/timestamping
TARGETS += nsfs TARGETS += nsfs
TARGETS += pidfd TARGETS += pidfd
TARGETS += powerpc TARGETS += powerpc
......
...@@ -24,3 +24,7 @@ tcp_fastopen_backup_key ...@@ -24,3 +24,7 @@ tcp_fastopen_backup_key
nettest nettest
fin_ack_lat fin_ack_lat
reuseaddr_ports_exhausted reuseaddr_ports_exhausted
hwtstamp_config
rxtimestamp
timestamping
txtimestamp
...@@ -15,6 +15,7 @@ TEST_PROGS += fin_ack_lat.sh fib_nexthop_multiprefix.sh fib_nexthops.sh ...@@ -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 += altnames.sh icmp_redirect.sh ip6_gre_headroom.sh
TEST_PROGS += route_localnet.sh TEST_PROGS += route_localnet.sh
TEST_PROGS += reuseaddr_ports_exhausted.sh TEST_PROGS += reuseaddr_ports_exhausted.sh
TEST_PROGS += txtimestamp.sh
TEST_PROGS_EXTENDED := in_netns.sh TEST_PROGS_EXTENDED := in_netns.sh
TEST_GEN_FILES = socket nettest TEST_GEN_FILES = socket nettest
TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any 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 ...@@ -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 += so_txtime ipv6_flowlabel ipv6_flowlabel_mgr
TEST_GEN_FILES += tcp_fastopen_backup_key TEST_GEN_FILES += tcp_fastopen_backup_key
TEST_GEN_FILES += fin_ack_lat 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_bpf reuseport_bpf_cpu reuseport_bpf_numa
TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls TEST_GEN_PROGS += reuseport_dualstack reuseaddr_conflict tls
TEST_GEN_FILES += reuseaddr_ports_exhausted
KSFT_KHDR_INSTALL := 1 KSFT_KHDR_INSTALL := 1
include ../lib.mk include ../lib.mk
......
...@@ -12,6 +12,7 @@ CONFIG_IPV6_VTI=y ...@@ -12,6 +12,7 @@ CONFIG_IPV6_VTI=y
CONFIG_DUMMY=y CONFIG_DUMMY=y
CONFIG_BRIDGE=y CONFIG_BRIDGE=y
CONFIG_VLAN_8021Q=y CONFIG_VLAN_8021Q=y
CONFIG_IFB=y
CONFIG_NETFILTER=y CONFIG_NETFILTER=y
CONFIG_NETFILTER_ADVANCED=y CONFIG_NETFILTER_ADVANCED=y
CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK=m
...@@ -27,5 +28,6 @@ CONFIG_NFT_CHAIN_NAT_IPV6=m ...@@ -27,5 +28,6 @@ CONFIG_NFT_CHAIN_NAT_IPV6=m
CONFIG_NFT_CHAIN_NAT_IPV4=m CONFIG_NFT_CHAIN_NAT_IPV4=m
CONFIG_NET_SCH_FQ=m CONFIG_NET_SCH_FQ=m
CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_ETF=m
CONFIG_NET_SCH_NETEM=y
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_KALLSYMS=y CONFIG_KALLSYMS=y
...@@ -76,7 +76,7 @@ main() { ...@@ -76,7 +76,7 @@ main() {
} }
if [[ "$(ip netns identify)" == "root" ]]; then if [[ "$(ip netns identify)" == "root" ]]; then
../../net/in_netns.sh $0 $@ ./in_netns.sh $0 $@
else else
main $@ main $@
fi fi
timestamping
rxtimestamp
txtimestamp
hwtstamp_config
# 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment