Commit 7a57b325 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'selftest-af_unix-misc-updates' 

Kuniyuki Iwashima says:

====================
selftest: af_unix: Misc updates.

Patch 1 add .gitignore under tools/testing/selftests/net/af_unix/.

Patch 2 make so_peek_off.c less flaky.
====================

Link: https://patch.msgid.link/20251124212805.486235-1-kuniyu@google.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents cfeb7cd8 ebe2f0b3

tools/testing/selftests/net/.gitignore

+0 −8
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ bind_timewait 
bind_wildcard

busy_poller

cmsg_sender

diag_uid

epoll_busy_poll

fin_ack_lat

hwtstamp_config
@@ -17,7 +16,6 @@ ipv6_flowlabel 
ipv6_flowlabel_mgr

ipv6_fragmentation

log.txt

msg_oob

msg_zerocopy

netlink-dumps

nettest
@@ -34,9 +32,6 @@ reuseport_bpf_numa 
reuseport_dualstack

rxtimestamp

sctp_hello

scm_inq

scm_pidfd

scm_rights

sk_bind_sendto_listen

sk_connect_zero_addr

sk_so_peek_off
@@ -44,7 +39,6 @@ skf_net_off 
socket

so_incoming_cpu

so_netns_cookie

so_peek_off

so_txtime

so_rcv_listener

stress_reuseport_listen
@@ -63,5 +57,3 @@ txtimestamp 
udpgso

udpgso_bench_rx

udpgso_bench_tx
 
unix_connect

unix_connreset

tools/testing/selftests/net/af_unix/.gitignore

0 → 100644
+8 −0
Original line number Diff line number Diff line 
diag_uid

msg_oob

scm_inq

scm_pidfd

scm_rights

so_peek_off

unix_connect

unix_connreset

tools/testing/selftests/net/af_unix/so_peek_off.c

+2 −2
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ FIXTURE_VARIANT_ADD(so_peek_off, seqpacket) 
FIXTURE_SETUP(so_peek_off)

{

	struct timeval timeout = {

		.tv_sec = 0,

		.tv_usec = 3000,

		.tv_sec = 5,

		.tv_usec = 0,

	};

	int ret;