authorgravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-10-04 17:48:05+02:00
committergravatar for joran@ronomon.comJoran Dirk Greef <joran@ronomon.com> 2020-10-04 17:48:05+02:00
log9be29410914e9d10171536fd275739dc8d1f437e
treea60222567985fdd41875d1c8d2b965f1fd7655c9
parent958ff087f263a98986abfbc2a471d7e974813b91

Split openat/close test into two separate tests

If an older kernel fails the `openat` test because of `AT_FDCWD` then we don't want to skip the `close` test.

1 files changed, 22 insertions(+), 4 deletions(-)

lib/std/os/linux/io_uring.zig+22-4
......@@ -1061,7 +1061,7 @@ test "write/read" {
10611061 testing.expectEqualSlices(u8, buffer_write[0..], buffer_read[0..]);
10621062}
10631063
1064test "openat/close" {
1064test "openat" {
10651065 if (builtin.os.tag != .linux) return error.SkipZigTest;
10661066
10671067 var ring = IO_Uring.init(1, 0) catch |err| switch (err) {
......@@ -1071,7 +1071,7 @@ test "openat/close" {
10711071 };
10721072 defer ring.deinit();
10731073
1074 const path = "test_io_uring_openat_close";
1074 const path = "test_io_uring_openat";
10751075 defer std.fs.cwd().deleteFile(path) catch {};
10761076
10771077 const flags: u32 = os.O_CLOEXEC | os.O_RDWR | os.O_CREAT;
......@@ -1107,9 +1107,27 @@ test "openat/close" {
11071107 testing.expect(cqe_openat.res > 0);
11081108 testing.expectEqual(@as(u32, 0), cqe_openat.flags);
11091109
1110 const sqe_close = try ring.close(1011, cqe_openat.res);
1110 os.close(cqe_openat.res);
1111}
1112
1113test "close" {
1114 if (builtin.os.tag != .linux) return error.SkipZigTest;
1115
1116 var ring = IO_Uring.init(1, 0) catch |err| switch (err) {
1117 error.SystemOutdated => return error.SkipZigTest,
1118 error.PermissionDenied => return error.SkipZigTest,
1119 else => return err
1120 };
1121 defer ring.deinit();
1122
1123 const path = "test_io_uring_close";
1124 const file = try std.fs.cwd().createFile(path, .{});
1125 errdefer file.close();
1126 defer std.fs.cwd().deleteFile(path) catch {};
1127
1128 const sqe_close = try ring.close(1011, file.handle);
11111129 testing.expectEqual(linux.IORING_OP.CLOSE, sqe_close.opcode);
1112 testing.expectEqual(cqe_openat.res, sqe_close.fd);
1130 testing.expectEqual(file.handle, sqe_close.fd);
11131131 testing.expectEqual(@as(u32, 1), try ring.submit());
11141132
11151133 const cqe_close = try ring.copy_cqe();