authorgravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-10-08 21:00:20+02:00
committergravatar for robin@voetter.nlRobin Voetter <robin@voetter.nl> 2023-10-15 14:00:26+02:00
log3ca1f888980641c9d9aff02100f277833b988413
tree8d7dd1f1fcaeca8eec03bac05729290a63ea07f1
parente2e4e1f8b4fa5d8394cb571d00b4b62eacea97df
signaturebadge-check Signed by SSH key SHA256:CQ99aPxq+RueiL9u7z0FEki5Fm7V6T8q4PrEGmINrA4

std.testing: disable expectEqualSlices printing for spirv

5 files changed, 8 insertions(+), 17 deletions(-)

lib/std/testing.zig+8-4
......@@ -21,13 +21,13 @@ pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");
2121/// TODO https://github.com/ziglang/zig/issues/5738
2222pub var log_level = std.log.Level.warn;
2323
24// Disable printing in tests for simple backends.
25pub const backend_can_print = builtin.zig_backend != .stage2_spirv64;
26
2427fn print(comptime fmt: []const u8, args: anytype) void {
2528 if (@inComptime()) {
2629 @compileError(std.fmt.comptimePrint(fmt, args));
27 } else {
28 // Disable printing in tests for simple backends.
29 if (builtin.zig_backend == .stage2_spirv64) return;
30
30 } else if (backend_can_print) {
3131 std.debug.print(fmt, args);
3232 }
3333}
......@@ -304,6 +304,10 @@ pub fn expectEqualSlices(comptime T: type, expected: []const T, actual: []const
304304 break :diff_index if (expected.len == actual.len) return else shortest;
305305 };
306306
307 if (!backend_can_print) {
308 return error.TestExpectedEqual;
309 }
310
307311 print("slices differ. first difference occurs at index {d} (0x{X})\n", .{ diff_index, diff_index });
308312
309313 // TODO: Should this be configurable by the caller?
test/behavior/basic.zig-1
......@@ -644,7 +644,6 @@ test "string escapes" {
644644 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
645645 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
646646 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
647 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
648647
649648 try expectEqualStrings("\"", "\x22");
650649 try expectEqualStrings("\'", "\x27");
test/behavior/cast.zig-10
......@@ -385,7 +385,6 @@ test "cast from ?[*]T to ??[*]T" {
385385test "peer type unsigned int to signed" {
386386 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
387387 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
388 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
389388
390389 var w: u31 = 5;
391390 var x: u8 = 7;
......@@ -1552,8 +1551,6 @@ test "single item pointer to pointer to array to slice" {
15521551}
15531552
15541553test "peer type resolution forms error union" {
1555 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1556
15571554 var foo: i32 = 123;
15581555 const result = if (foo < 0) switch (-foo) {
15591556 0 => unreachable,
......@@ -1641,7 +1638,6 @@ test "peer type resolution: same array type with sentinel" {
16411638 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16421639 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
16431640 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1644 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
16451641
16461642 var a: [2:0]u32 = .{ 0, 1 };
16471643 var b: [2:0]u32 = .{ 2, 3 };
......@@ -1662,7 +1658,6 @@ test "peer type resolution: array with sentinel and array without sentinel" {
16621658 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16631659 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
16641660 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1665 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
16661661
16671662 var a: [2:0]u32 = .{ 0, 1 };
16681663 var b: [2]u32 = .{ 2, 3 };
......@@ -1852,7 +1847,6 @@ test "peer type resolution: array and tuple" {
18521847 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
18531848 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
18541849 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1855 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
18561850
18571851 var arr: [3]i32 = .{ 1, 2, 3 };
18581852 const tup = .{ 4, 5, 6 };
......@@ -1939,7 +1933,6 @@ test "peer type resolution: empty tuple pointer and slice" {
19391933 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
19401934 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
19411935 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1942 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19431936
19441937 var a: [:0]const u8 = "Hello";
19451938 var b = &.{};
......@@ -1959,7 +1952,6 @@ test "peer type resolution: tuple pointer and slice" {
19591952 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
19601953 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
19611954 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1962 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19631955
19641956 var a: [:0]const u8 = "Hello";
19651957 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };
......@@ -1979,7 +1971,6 @@ test "peer type resolution: tuple pointer and optional slice" {
19791971 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
19801972 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
19811973 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1982 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19831974
19841975 var a: ?[:0]const u8 = null;
19851976 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };
......@@ -2117,7 +2108,6 @@ test "peer type resolution: pointer attributes are combined correctly" {
21172108 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
21182109 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
21192110 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2120 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
21212111
21222112 var buf_a align(4) = "foo".*;
21232113 var buf_b align(4) = "bar".*;
test/behavior/src.zig-1
......@@ -17,7 +17,6 @@ test "@src" {
1717 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1818 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1919 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
20 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
2120
2221 try doTheTest();
2322}
test/behavior/struct.zig-1
......@@ -954,7 +954,6 @@ test "tuple element initialized with fn call" {
954954 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
955955 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
956956 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
957 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
958957
959958 const S = struct {
960959 fn doTheTest() !void {