diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-11-25 19:52:30 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-11-25 19:52:30 -0800 |
| commit | 7a57b325235e9ed3d5f8905993a87c20fd22a95c (patch) | |
| tree | a2457425db01eb935df5f606003207473bb465b9 | |
| parent | cfeb7cd80f40dbe02ee95cd175dec341c42abae1 (diff) | |
| parent | ebe2f0b3cfe380120adec59264d58d5b26b931ed (diff) | |
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: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | tools/testing/selftests/net/.gitignore | 8 | ||||
| -rw-r--r-- | tools/testing/selftests/net/af_unix/.gitignore | 8 | ||||
| -rw-r--r-- | tools/testing/selftests/net/af_unix/so_peek_off.c | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tools/testing/selftests/net/.gitignore b/tools/testing/selftests/net/.gitignore index 283ca5ffc244..6930fe926c58 100644 --- a/tools/testing/selftests/net/.gitignore +++ b/tools/testing/selftests/net/.gitignore @@ -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 diff --git a/tools/testing/selftests/net/af_unix/.gitignore b/tools/testing/selftests/net/af_unix/.gitignore new file mode 100644 index 000000000000..240b26740c9e --- /dev/null +++ b/tools/testing/selftests/net/af_unix/.gitignore @@ -0,0 +1,8 @@ +diag_uid +msg_oob +scm_inq +scm_pidfd +scm_rights +so_peek_off +unix_connect +unix_connreset diff --git a/tools/testing/selftests/net/af_unix/so_peek_off.c b/tools/testing/selftests/net/af_unix/so_peek_off.c index 1a77728128e5..86e7b0fb522d 100644 --- a/tools/testing/selftests/net/af_unix/so_peek_off.c +++ b/tools/testing/selftests/net/af_unix/so_peek_off.c @@ -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; |