From be4a77d9aaf724bb11b6d55457b5be80b60b4aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Anic=CC=81?= Date: Sat, 18 Nov 2023 05:40:24 +0100 Subject: [PATCH] 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, ¶ms); ^ /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 --- lib/std/os/linux/io_uring.zig | 36 +++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/lib/std/os/linux/io_uring.zig b/lib/std/os/linux/io_uring.zig index cc34ad0319..6da25cf628 100644 --- a/lib/std/os/linux/io_uring.zig +++ b/lib/std/os/linux/io_uring.zig @@ -3804,7 +3804,11 @@ test "accept multishot" { test "accept/connect/send_zc/recv" { try skipKernelLessThan(.{ .major = 6, .minor = 0, .patch = 0 }); - var ring = try IO_Uring.init(16, 0); + var ring = IO_Uring.init(16, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); const socket_test_harness = try createSocketTestHarness(&ring); @@ -3853,7 +3857,11 @@ test "accept/connect/send_zc/recv" { test "accept_direct" { try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 }); - var ring = try IO_Uring.init(1, 0); + var ring = IO_Uring.init(1, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); var address = try net.Address.parseIp4("127.0.0.1", 0); @@ -3929,7 +3937,11 @@ test "accept_direct" { test "accept_multishot_direct" { try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 }); - var ring = try IO_Uring.init(1, 0); + var ring = IO_Uring.init(1, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); var address = try net.Address.parseIp4("127.0.0.1", 0); @@ -3983,7 +3995,11 @@ test "accept_multishot_direct" { test "socket" { try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 }); - var ring = try IO_Uring.init(2, 0); + var ring = IO_Uring.init(1, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); // prepare, submit socket operation @@ -4002,7 +4018,11 @@ test "socket" { test "socket_direct/socket_direct_alloc/close_direct" { try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 }); - var ring = try IO_Uring.init(2, 0); + var ring = IO_Uring.init(2, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); var registered_fds = [_]os.fd_t{-1} ** 3; @@ -4076,7 +4096,11 @@ test "socket_direct/socket_direct_alloc/close_direct" { test "openat_direct/close_direct" { try skipKernelLessThan(.{ .major = 5, .minor = 19, .patch = 0 }); - var ring = try IO_Uring.init(2, 0); + var ring = IO_Uring.init(2, 0) catch |err| switch (err) { + error.SystemOutdated => return error.SkipZigTest, + error.PermissionDenied => return error.SkipZigTest, + else => return err, + }; defer ring.deinit(); var registered_fds = [_]os.fd_t{-1} ** 3;