Skip to content

Commit 7a57b32

Browse files
committed
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/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
2 parents cfeb7cd + ebe2f0b commit 7a57b32

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

tools/testing/selftests/net/.gitignore

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bind_timewait
44
bind_wildcard
55
busy_poller
66
cmsg_sender
7-
diag_uid
87
epoll_busy_poll
98
fin_ack_lat
109
hwtstamp_config
@@ -17,7 +16,6 @@ ipv6_flowlabel
1716
ipv6_flowlabel_mgr
1817
ipv6_fragmentation
1918
log.txt
20-
msg_oob
2119
msg_zerocopy
2220
netlink-dumps
2321
nettest
@@ -34,17 +32,13 @@ reuseport_bpf_numa
3432
reuseport_dualstack
3533
rxtimestamp
3634
sctp_hello
37-
scm_inq
38-
scm_pidfd
39-
scm_rights
4035
sk_bind_sendto_listen
4136
sk_connect_zero_addr
4237
sk_so_peek_off
4338
skf_net_off
4439
socket
4540
so_incoming_cpu
4641
so_netns_cookie
47-
so_peek_off
4842
so_txtime
4943
so_rcv_listener
5044
stress_reuseport_listen
@@ -63,5 +57,3 @@ txtimestamp
6357
udpgso
6458
udpgso_bench_rx
6559
udpgso_bench_tx
66-
unix_connect
67-
unix_connreset
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
diag_uid
2+
msg_oob
3+
scm_inq
4+
scm_pidfd
5+
scm_rights
6+
so_peek_off
7+
unix_connect
8+
unix_connreset

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ FIXTURE_VARIANT_ADD(so_peek_off, seqpacket)
3636
FIXTURE_SETUP(so_peek_off)
3737
{
3838
struct timeval timeout = {
39-
.tv_sec = 0,
40-
.tv_usec = 3000,
39+
.tv_sec = 5,
40+
.tv_usec = 0,
4141
};
4242
int ret;
4343

0 commit comments

Comments
 (0)