From ac165458959d9db9c9fd0362aeb35f8b983cdf6a Mon Sep 17 00:00:00 2001 From: Robin Voetter Date: Sat, 6 Apr 2024 13:52:48 +0200 Subject: [PATCH] spirv: enable passing tests --- test/behavior/destructure.zig | 2 -- test/behavior/fn.zig | 1 - test/behavior/generics.zig | 1 - test/behavior/math.zig | 2 -- test/behavior/switch.zig | 2 -- test/behavior/union.zig | 1 - test/behavior/vector.zig | 2 -- 7 files changed, 11 deletions(-) diff --git a/test/behavior/destructure.zig b/test/behavior/destructure.zig index 78ee999ddb..43ddbb7a4d 100644 --- a/test/behavior/destructure.zig +++ b/test/behavior/destructure.zig @@ -23,8 +23,6 @@ test "simple destructure" { } test "destructure with comptime syntax" { - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; - const S = struct { fn doTheTest() !void { { diff --git a/test/behavior/fn.zig b/test/behavior/fn.zig index 17acdd8f1a..8a008d987d 100644 --- a/test/behavior/fn.zig +++ b/test/behavior/fn.zig @@ -181,7 +181,6 @@ test "function with complex callconv and return type expressions" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; try expect(fComplexCallconvRet(3).x == 9); } diff --git a/test/behavior/generics.zig b/test/behavior/generics.zig index e1961695aa..9786ea5d06 100644 --- a/test/behavior/generics.zig +++ b/test/behavior/generics.zig @@ -447,7 +447,6 @@ test "return type of generic function is function pointer" { test "coerced function body has inequal value with its uncoerced body" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; const S = struct { const A = B(i32, c); diff --git a/test/behavior/math.zig b/test/behavior/math.zig index 370e7465db..efc698c128 100644 --- a/test/behavior/math.zig +++ b/test/behavior/math.zig @@ -12,7 +12,6 @@ const math = std.math; test "assignment operators" { if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; var i: u32 = 0; i += 5; @@ -188,7 +187,6 @@ test "@ctz vectors" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) { // This regressed with LLVM 14: diff --git a/test/behavior/switch.zig b/test/behavior/switch.zig index 2e3e8365ba..c36b4a520d 100644 --- a/test/behavior/switch.zig +++ b/test/behavior/switch.zig @@ -850,8 +850,6 @@ test "inline switch range that includes the maximum value of the switched type" } test "nested break ignores switch conditions and breaks instead" { - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; - const S = struct { fn register_to_address(ident: []const u8) !u8 { const reg: u8 = if (std.mem.eql(u8, ident, "zero")) 0x00 else blk: { diff --git a/test/behavior/union.zig b/test/behavior/union.zig index ffdf2305d2..43131ae2d4 100644 --- a/test/behavior/union.zig +++ b/test/behavior/union.zig @@ -1750,7 +1750,6 @@ test "reinterpret extern union" { // https://github.com/ziglang/zig/issues/19389 return error.SkipZigTest; } - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; const U = extern union { foo: u8, diff --git a/test/behavior/vector.zig b/test/behavior/vector.zig index 5d61f471aa..eaf09db628 100644 --- a/test/behavior/vector.zig +++ b/test/behavior/vector.zig @@ -76,7 +76,6 @@ test "vector int operators" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; const S = struct { fn doTheTest() !void { @@ -1037,7 +1036,6 @@ test "multiplication-assignment operator with an array operand" { if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO - if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; const S = struct { fn doTheTest() !void {