diff --git a/lib/std/atomic/queue.zig b/lib/std/atomic/queue.zig index 6aac3246c707031ed15584000e05c23705b96130..dbc011bed3a86731757791d710ba231c4ea580c7 100644 --- a/lib/std/atomic/queue.zig +++ b/lib/std/atomic/queue.zig @@ -152,9 +152,6 @@ const puts_per_thread = 500; const put_thread_count = 3; test "std.atomic.Queue" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - var plenty_of_memory = try std.heap.direct_allocator.alloc(u8, 300 * 1024); defer std.heap.direct_allocator.free(plenty_of_memory); diff --git a/lib/std/atomic/stack.zig b/lib/std/atomic/stack.zig index f96696c923444a76356ffe73c9d995a914bf35a1..dd288adbf1607b02c31fbc0ce19fb83c1e4ed4b9 100644 --- a/lib/std/atomic/stack.zig +++ b/lib/std/atomic/stack.zig @@ -86,9 +86,6 @@ const puts_per_thread = 500; const put_thread_count = 3; test "std.atomic.stack" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - var plenty_of_memory = try std.heap.direct_allocator.alloc(u8, 300 * 1024); defer std.heap.direct_allocator.free(plenty_of_memory); diff --git a/lib/std/event/channel.zig b/lib/std/event/channel.zig index 74a2fe27f319421898ab6bca48eba564547ec73b..2ea99d234d6d84ec63019f6e5fcb083caa4680cc 100644 --- a/lib/std/event/channel.zig +++ b/lib/std/event/channel.zig @@ -263,9 +263,6 @@ pub fn Channel(comptime T: type) type { } test "std.event.Channel" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - // https://github.com/ziglang/zig/issues/1908 if (builtin.single_threaded) return error.SkipZigTest; diff --git a/lib/std/event/group.zig b/lib/std/event/group.zig index 0f5978c3e236ce51fa40b00907d283d2c1f143de..ee15c1d3c2aaa0fdfb3bea8d45fedde5719ee103 100644 --- a/lib/std/event/group.zig +++ b/lib/std/event/group.zig @@ -81,9 +81,6 @@ pub fn Group(comptime ReturnType: type) type { } test "std.event.Group" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - // https://github.com/ziglang/zig/issues/1908 if (builtin.single_threaded) return error.SkipZigTest; diff --git a/lib/std/event/lock.zig b/lib/std/event/lock.zig index 275b431ca786a7ce7e3b5826523f525aeb58f13e..da70b571df8f252fddf1e0d3f0c6782683f38c20 100644 --- a/lib/std/event/lock.zig +++ b/lib/std/event/lock.zig @@ -117,9 +117,6 @@ pub const Lock = struct { }; test "std.event.Lock" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - // TODO https://github.com/ziglang/zig/issues/1908 if (builtin.single_threaded) return error.SkipZigTest; diff --git a/lib/std/fs.zig b/lib/std/fs.zig index 460789366a09dd6d782a6b7363324032067a67f0..2a96fd3fbcd6d2e05ae7df22195a7fb11896d4d7 100644 --- a/lib/std/fs.zig +++ b/lib/std/fs.zig @@ -424,7 +424,7 @@ pub const Dir = struct { self.end_index = @intCast(usize, rc); } const darwin_entry = @ptrCast(*align(1) os.dirent, &self.buf[self.index]); - const next_index = self.index + darwin_entry.d_reclen; + const next_index = self.index + darwin_entry.reclen(); self.index = next_index; const name = @ptrCast([*]u8, &darwin_entry.d_name)[0..darwin_entry.d_namlen]; @@ -473,7 +473,7 @@ pub const Dir = struct { self.end_index = @intCast(usize, rc); } const freebsd_entry = @ptrCast(*align(1) os.dirent, &self.buf[self.index]); - const next_index = self.index + freebsd_entry.d_reclen; + const next_index = self.index + freebsd_entry.reclen(); self.index = next_index; const name = @ptrCast([*]u8, &freebsd_entry.d_name)[0..freebsd_entry.d_namlen]; @@ -529,7 +529,7 @@ pub const Dir = struct { self.end_index = rc; } const linux_entry = @ptrCast(*align(1) os.dirent64, &self.buf[self.index]); - const next_index = self.index + linux_entry.d_reclen; + const next_index = self.index + linux_entry.reclen(); self.index = next_index; const name = mem.toSlice(u8, @ptrCast([*]u8, &linux_entry.d_name)); diff --git a/lib/std/mutex.zig b/lib/std/mutex.zig index e7dd173b011e00cb29f7eb0f7b15c10b0c3156e8..5f3b9272d932a9dc860a762113f852b6701cf1bb 100644 --- a/lib/std/mutex.zig +++ b/lib/std/mutex.zig @@ -130,9 +130,6 @@ const TestContext = struct { }; test "std.Mutex" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - var plenty_of_memory = try std.heap.direct_allocator.alloc(u8, 300 * 1024); defer std.heap.direct_allocator.free(plenty_of_memory); diff --git a/lib/std/os/bits/darwin.zig b/lib/std/os/bits/darwin.zig index 0a417a587a85037dbf634ff325385538e154f69d..ca7f66366193ad08d40685eb2c15fea3762c808d 100644 --- a/lib/std/os/bits/darwin.zig +++ b/lib/std/os/bits/darwin.zig @@ -128,7 +128,7 @@ pub const dirent = extern struct { d_type: u8, d_name: u8, // field address is address of first byte of name - pub fn reclen(self: dirent) usize { + pub fn reclen(self: dirent) u16 { return self.d_reclen; } }; diff --git a/lib/std/os/bits/dragonfly.zig b/lib/std/os/bits/dragonfly.zig index 9efc7297c89393b4d9d9173f8f0aeff712ade9c3..d1b65707f45a8a2eac8d39d788ce5a5d9c0c372b 100644 --- a/lib/std/os/bits/dragonfly.zig +++ b/lib/std/os/bits/dragonfly.zig @@ -314,8 +314,8 @@ pub const dirent = extern struct { d_unused2: u32, d_name: [256]u8, - pub fn reclen(self: dirent) usize { - return (@byteOffsetOf(dirent, "d_name") + self.d_namlen + 1 + 7) & ~usize(7); + pub fn reclen(self: dirent) u16 { + return (@byteOffsetOf(dirent, "d_name") + self.d_namlen + 1 + 7) & ~u16(7); } }; diff --git a/lib/std/os/bits/freebsd.zig b/lib/std/os/bits/freebsd.zig index 9be070010ba39fffad820bf1a6c193b880c2863c..b0506ad0e11a36e879b73a902510ff57f5789544 100644 --- a/lib/std/os/bits/freebsd.zig +++ b/lib/std/os/bits/freebsd.zig @@ -133,7 +133,7 @@ pub const dirent = extern struct { d_pad1: u16, d_name: [256]u8, - pub fn reclen(self: dirent) usize { + pub fn reclen(self: dirent) u16 { return self.d_reclen; } }; diff --git a/lib/std/os/bits/linux.zig b/lib/std/os/bits/linux.zig index 46c47bf3391f96d5b7c91f6ee8a8dfcce2553a5b..f1bd06bdc98db37d92bd2c243a32ffc21ec1fad2 100644 --- a/lib/std/os/bits/linux.zig +++ b/lib/std/os/bits/linux.zig @@ -988,7 +988,7 @@ pub const dirent64 = extern struct { d_type: u8, d_name: u8, // field address is the address of first byte of name https://github.com/ziglang/zig/issues/173 - pub fn reclen(self: dirent) usize { + pub fn reclen(self: dirent) u16 { return self.d_reclen; } }; diff --git a/lib/std/os/bits/netbsd.zig b/lib/std/os/bits/netbsd.zig index ff6f8d2f809a0934918a5430a1cf08e61355f174..f93bbbf10643d6ec14bc64684015921c0840b83d 100644 --- a/lib/std/os/bits/netbsd.zig +++ b/lib/std/os/bits/netbsd.zig @@ -129,7 +129,7 @@ pub const dirent = extern struct { d_off: i64, d_name: [512]u8, - pub fn reclen(self: dirent) usize { + pub fn reclen(self: dirent) u16 { return self.d_reclen; } }; diff --git a/lib/std/os/test.zig b/lib/std/os/test.zig index 7ea834e28c35d95ab69bfd8f3181bb28605281ca..1d615483969a0c1464126c57e0e3d495e4ce6f8b 100644 --- a/lib/std/os/test.zig +++ b/lib/std/os/test.zig @@ -16,9 +16,6 @@ const AtomicRmwOp = builtin.AtomicRmwOp; const AtomicOrder = builtin.AtomicOrder; test "makePath, put some files in it, deleteTree" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - try fs.makePath(a, "os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c"); try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c" ++ fs.path.sep_str ++ "file.txt", "nonsense"); try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "file2.txt", "blah"); @@ -31,9 +28,6 @@ test "makePath, put some files in it, deleteTree" { } test "access file" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - try fs.makePath(a, "os_test_tmp"); if (File.access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt")) |ok| { @panic("expected error"); @@ -101,9 +95,6 @@ test "cpu count" { } test "AtomicFile" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - var buffer: [1024]u8 = undefined; const allocator = &std.heap.FixedBufferAllocator.init(buffer[0..]).allocator; const test_out_file = "tmp_atomic_file_test_dest.txt"; @@ -124,9 +115,6 @@ test "AtomicFile" { } test "thread local storage" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - if (builtin.single_threaded) return error.SkipZigTest; const thread1 = try Thread.spawn({}, testTls); const thread2 = try Thread.spawn({}, testTls); diff --git a/lib/std/statically_initialized_mutex.zig b/lib/std/statically_initialized_mutex.zig index 27d2722378cffa849a8acdd621f83de23d09fde8..2ad47b5d915d32bf105fad237be3b6f85d4fa7b0 100644 --- a/lib/std/statically_initialized_mutex.zig +++ b/lib/std/statically_initialized_mutex.zig @@ -61,9 +61,6 @@ pub const StaticallyInitializedMutex = switch (builtin.os) { }; test "std.StaticallyInitializedMutex" { - // https://github.com/ziglang/zig/issues/3563 - if (builtin.os == .dragonfly) return error.SkipZigTest; - const TestContext = struct { data: i128,