authorgravatar for igor.anic@gmail.comIgor Anić <igor.anic@gmail.com> 2023-11-18 05:40:24+01:00
committergravatar for igor.anic@gmail.comIgor Anić <igor.anic@gmail.com> 2023-11-18 05:40:24+01:00
logbe4a77d9aaf724bb11b6d55457b5be80b60b4aa8
tree2747fb920cb5988c0f936a963ddd6f6334252b1d
parent7eee0d3353c669fdf01999b319ab37883a107754

io_uring: fix ci failing test

Getting this error in ci: run test std-arm-linux-none-generic-Debug: error: 'test.accept/connect/send_zc/recv' failed: /home/ci/actions-runner1/_work/zig/zig/lib/std/os/linux/io_uring.zig:60:23: 0x70b06b in init_params (test) .NOSYS => return error.SystemOutdated, ^ /home/ci/actions-runner1/_work/zig/zig/lib/std/os/linux/io_uring.zig:27:16: 0x70b6b7 in init (test) return try IO_Uring.init_params(entries, &params); ^ /home/ci/actions-runner1/_work/zig/zig/lib/std/os/linux/io_uring.zig:3807:16: 0x72405b in test.accept/connect/send_zc/recv (test) var ring = try IO_Uring.init(16, 0); https://github.com/ziglang/zig/actions/runs/6909813408/job/18801841015?pr=18025

1 files changed, 30 insertions(+), 6 deletions(-)

lib/std/os/linux/io_uring.zig+30-6
...@@ -3804,7 +3804,11 @@ test "accept multishot" {...@@ -3804,7 +3804,11 @@ test "accept multishot" {
3804test "accept/connect/send_zc/recv" {3804test "accept/connect/send_zc/recv" {
3805 try skipKernelLessThan(.{ .major = 6, .minor = 0, .patch = 0 });3805 try skipKernelLessThan(.{ .major = 6, .minor = 0, .patch = 0 });
38063806
3807 var ring = try IO_Uring.init(16, 0);3807 var ring = IO_Uring.init(16, 0) catch |err| switch (err) {
3808 error.SystemOutdated => return error.SkipZigTest,
3809 error.PermissionDenied => return error.SkipZigTest,
3810 else => return err,
3811 };
3808 defer ring.deinit();3812 defer ring.deinit();
38093813
3810 const socket_test_harness = try createSocketTestHarness(&ring);3814 const socket_test_harness = try createSocketTestHarness(&ring);
...@@ -3853,7 +3857,11 @@ test "accept/connect/send_zc/recv" {...@@ -3853,7 +3857,11 @@ test "accept/connect/send_zc/recv" {
3853test "accept_direct" {3857test "accept_direct" {
3854 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });3858 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });
38553859
3856 var ring = try IO_Uring.init(1, 0);3860 var ring = IO_Uring.init(1, 0) catch |err| switch (err) {
3861 error.SystemOutdated => return error.SkipZigTest,
3862 error.PermissionDenied => return error.SkipZigTest,
3863 else => return err,
3864 };
3857 defer ring.deinit();3865 defer ring.deinit();
3858 var address = try net.Address.parseIp4("127.0.0.1", 0);3866 var address = try net.Address.parseIp4("127.0.0.1", 0);
38593867
...@@ -3929,7 +3937,11 @@ test "accept_direct" {...@@ -3929,7 +3937,11 @@ test "accept_direct" {
3929test "accept_multishot_direct" {3937test "accept_multishot_direct" {
3930 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });3938 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });
39313939
3932 var ring = try IO_Uring.init(1, 0);3940 var ring = IO_Uring.init(1, 0) catch |err| switch (err) {
3941 error.SystemOutdated => return error.SkipZigTest,
3942 error.PermissionDenied => return error.SkipZigTest,
3943 else => return err,
3944 };
3933 defer ring.deinit();3945 defer ring.deinit();
39343946
3935 var address = try net.Address.parseIp4("127.0.0.1", 0);3947 var address = try net.Address.parseIp4("127.0.0.1", 0);
...@@ -3983,7 +3995,11 @@ test "accept_multishot_direct" {...@@ -3983,7 +3995,11 @@ test "accept_multishot_direct" {
3983test "socket" {3995test "socket" {
3984 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });3996 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });
39853997
3986 var ring = try IO_Uring.init(2, 0);3998 var ring = IO_Uring.init(1, 0) catch |err| switch (err) {
3999 error.SystemOutdated => return error.SkipZigTest,
4000 error.PermissionDenied => return error.SkipZigTest,
4001 else => return err,
4002 };
3987 defer ring.deinit();4003 defer ring.deinit();
39884004
3989 // prepare, submit socket operation4005 // prepare, submit socket operation
...@@ -4002,7 +4018,11 @@ test "socket" {...@@ -4002,7 +4018,11 @@ test "socket" {
4002test "socket_direct/socket_direct_alloc/close_direct" {4018test "socket_direct/socket_direct_alloc/close_direct" {
4003 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });4019 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });
40044020
4005 var ring = try IO_Uring.init(2, 0);4021 var ring = IO_Uring.init(2, 0) catch |err| switch (err) {
4022 error.SystemOutdated => return error.SkipZigTest,
4023 error.PermissionDenied => return error.SkipZigTest,
4024 else => return err,
4025 };
4006 defer ring.deinit();4026 defer ring.deinit();
40074027
4008 var registered_fds = [_]os.fd_t{-1} ** 3;4028 var registered_fds = [_]os.fd_t{-1} ** 3;
...@@ -4076,7 +4096,11 @@ test "socket_direct/socket_direct_alloc/close_direct" {...@@ -4076,7 +4096,11 @@ test "socket_direct/socket_direct_alloc/close_direct" {
4076test "openat_direct/close_direct" {4096test "openat_direct/close_direct" {
4077 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });4097 try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 });
40784098
4079 var ring = try IO_Uring.init(2, 0);4099 var ring = IO_Uring.init(2, 0) catch |err| switch (err) {
4100 error.SystemOutdated => return error.SkipZigTest,
4101 error.PermissionDenied => return error.SkipZigTest,
4102 else => return err,
4103 };
4080 defer ring.deinit();4104 defer ring.deinit();
40814105
4082 var registered_fds = [_]os.fd_t{-1} ** 3;4106 var registered_fds = [_]os.fd_t{-1} ** 3;