diff options
| author | Veikka Tuominen <git@vexu.eu> | 2020-12-24 10:59:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-24 10:59:37 +0200 |
| commit | 83646df2cce59f254822355ec1ceeb6884e1177e (patch) | |
| tree | 3266d030c2d6e5da949f74840afa5f47a72b2bb3 /lib/std/os | |
| parent | 0fd68f49e2eabb866ea1d21c4657c2a1d3c8ce53 (diff) | |
| parent | e79acc24d301bd4d6afe715ce1e6be9dc3c654b5 (diff) | |
| download | zig-83646df2cce59f254822355ec1ceeb6884e1177e.tar.gz zig-83646df2cce59f254822355ec1ceeb6884e1177e.zip | |
Merge pull request #7531 from Vexu/orphanage
Move ArrayListSentineled to std lib orphanage
Diffstat (limited to 'lib/std/os')
| -rw-r--r-- | lib/std/os/linux/io_uring.zig | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/std/os/linux/io_uring.zig b/lib/std/os/linux/io_uring.zig index 0fdc7651d2..a19685d33b 100644 --- a/lib/std/os/linux/io_uring.zig +++ b/lib/std/os/linux/io_uring.zig @@ -1378,11 +1378,10 @@ test "timeout_remove" { // Timeout remove operations set the fd to -1, which results in EBADF before EINVAL. // We use IORING_FEAT_RW_CUR_POS as a safety check here to make sure we are at least pre-5.6. // We don't want to skip this test for newer kernels. - if ( - cqe_timeout.user_data == 0x99999999 and + if (cqe_timeout.user_data == 0x99999999 and cqe_timeout.res == -linux.EBADF and - (ring.features & linux.IORING_FEAT_RW_CUR_POS) == 0 - ) { + (ring.features & linux.IORING_FEAT_RW_CUR_POS) == 0) + { return error.SkipZigTest; } testing.expectEqual(linux.io_uring_cqe{ |