authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-04 00:31:26+02:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-10-04 00:31:26+02:00
log6b231b9e3f26c46b5e4b1ab63006753753e58cf3
tree47f09bcccd7344b0d6a2c2bd9bce6ea6b1f4a0f3
parent9b273f6b9acaf288920e8320adaa34f30348e97f
parent1e838eba7543db06b2e57919c94d740188a11bfb
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21571 from alexrp/14366-progress

Re-enable some tests that were disabled due to #14366

3 files changed, 7 insertions(+), 7 deletions(-)

lib/std/math/float.zig-3
...@@ -172,9 +172,6 @@ test nan {...@@ -172,9 +172,6 @@ test nan {
172}172}
173173
174test snan {174test snan {
175 // TODO: https://github.com/ziglang/zig/issues/14366
176 if (builtin.zig_backend == .stage2_llvm and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
177
178 const snan_u16: u16 = 0x7D00;175 const snan_u16: u16 = 0x7D00;
179 const snan_u32: u32 = 0x7FA00000;176 const snan_u32: u32 = 0x7FA00000;
180 const snan_u64: u64 = 0x7FF4000000000000;177 const snan_u64: u64 = 0x7FF4000000000000;
lib/std/math/isnan.zig+7-1
...@@ -32,7 +32,13 @@ test isSignalNan {...@@ -32,7 +32,13 @@ test isSignalNan {
32 // TODO: Signalling NaN values get converted to quiet NaN values in32 // TODO: Signalling NaN values get converted to quiet NaN values in
33 // some cases where they shouldn't such that this can fail.33 // some cases where they shouldn't such that this can fail.
34 // See https://github.com/ziglang/zig/issues/1436634 // See https://github.com/ziglang/zig/issues/14366
35 // try expect(isSignalNan(math.snan(T)));35 if (!builtin.cpu.arch.isArmOrThumb() and
36 !builtin.cpu.arch.isAARCH64() and
37 !builtin.cpu.arch.isPowerPC() and
38 builtin.zig_backend != .stage2_c)
39 {
40 try expect(isSignalNan(math.snan(T)));
41 }
36 try expect(!isSignalNan(math.nan(T)));42 try expect(!isSignalNan(math.nan(T)));
37 try expect(!isSignalNan(@as(T, 1.0)));43 try expect(!isSignalNan(@as(T, 1.0)));
38 try expect(!isSignalNan(math.inf(T)));44 try expect(!isSignalNan(math.inf(T)));
test/behavior/bitcast.zig-3
...@@ -429,9 +429,6 @@ test "bitcast nan float does not modify signaling bit" {...@@ -429,9 +429,6 @@ test "bitcast nan float does not modify signaling bit" {
429 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;429 if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
430 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;430 if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
431431
432 // TODO: https://github.com/ziglang/zig/issues/14366
433 if (builtin.zig_backend == .stage2_llvm and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
434
435 const snan_u16: u16 = 0x7D00;432 const snan_u16: u16 = 0x7D00;
436 const snan_u32: u32 = 0x7FA00000;433 const snan_u32: u32 = 0x7FA00000;
437 const snan_u64: u64 = 0x7FF4000000000000;434 const snan_u64: u64 = 0x7FF4000000000000;