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("");...@@ -21,13 +21,13 @@ pub var base_allocator_instance = std.heap.FixedBufferAllocator.init("");
21/// TODO https://github.com/ziglang/zig/issues/573821/// TODO https://github.com/ziglang/zig/issues/5738
22pub var log_level = std.log.Level.warn;22pub 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
24fn print(comptime fmt: []const u8, args: anytype) void {27fn print(comptime fmt: []const u8, args: anytype) void {
25 if (@inComptime()) {28 if (@inComptime()) {
26 @compileError(std.fmt.comptimePrint(fmt, args));29 @compileError(std.fmt.comptimePrint(fmt, args));
27 } else {30 } else if (backend_can_print) {
28 // Disable printing in tests for simple backends.
29 if (builtin.zig_backend == .stage2_spirv64) return;
30
31 std.debug.print(fmt, args);31 std.debug.print(fmt, args);
32 }32 }
33}33}
...@@ -304,6 +304,10 @@ pub fn expectEqualSlices(comptime T: type, expected: []const T, actual: []const...@@ -304,6 +304,10 @@ pub fn expectEqualSlices(comptime T: type, expected: []const T, actual: []const
304 break :diff_index if (expected.len == actual.len) return else shortest;304 break :diff_index if (expected.len == actual.len) return else shortest;
305 };305 };
306306
307 if (!backend_can_print) {
308 return error.TestExpectedEqual;
309 }
310
307 print("slices differ. first difference occurs at index {d} (0x{X})\n", .{ diff_index, diff_index });311 print("slices differ. first difference occurs at index {d} (0x{X})\n", .{ diff_index, diff_index });
308312
309 // TODO: Should this be configurable by the caller?313 // TODO: Should this be configurable by the caller?
test/behavior/basic.zig-1
...@@ -644,7 +644,6 @@ test "string escapes" {...@@ -644,7 +644,6 @@ test "string escapes" {
644 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;644 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
645 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;645 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
646 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO646 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
647 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
648647
649 try expectEqualStrings("\"", "\x22");648 try expectEqualStrings("\"", "\x22");
650 try expectEqualStrings("\'", "\x27");649 try expectEqualStrings("\'", "\x27");
test/behavior/cast.zig-10
...@@ -385,7 +385,6 @@ test "cast from ?[*]T to ??[*]T" {...@@ -385,7 +385,6 @@ test "cast from ?[*]T to ??[*]T" {
385test "peer type unsigned int to signed" {385test "peer type unsigned int to signed" {
386 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;386 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
387 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO387 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
388 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
389388
390 var w: u31 = 5;389 var w: u31 = 5;
391 var x: u8 = 7;390 var x: u8 = 7;
...@@ -1552,8 +1551,6 @@ test "single item pointer to pointer to array to slice" {...@@ -1552,8 +1551,6 @@ test "single item pointer to pointer to array to slice" {
1552}1551}
15531552
1554test "peer type resolution forms error union" {1553test "peer type resolution forms error union" {
1555 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1556
1557 var foo: i32 = 123;1554 var foo: i32 = 123;
1558 const result = if (foo < 0) switch (-foo) {1555 const result = if (foo < 0) switch (-foo) {
1559 0 => unreachable,1556 0 => unreachable,
...@@ -1641,7 +1638,6 @@ test "peer type resolution: same array type with sentinel" {...@@ -1641,7 +1638,6 @@ test "peer type resolution: same array type with sentinel" {
1641 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1638 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1642 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1639 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1643 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1640 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1644 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
16451641
1646 var a: [2:0]u32 = .{ 0, 1 };1642 var a: [2:0]u32 = .{ 0, 1 };
1647 var b: [2:0]u32 = .{ 2, 3 };1643 var b: [2:0]u32 = .{ 2, 3 };
...@@ -1662,7 +1658,6 @@ test "peer type resolution: array with sentinel and array without sentinel" {...@@ -1662,7 +1658,6 @@ test "peer type resolution: array with sentinel and array without sentinel" {
1662 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1658 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1663 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1659 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1664 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1660 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1665 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
16661661
1667 var a: [2:0]u32 = .{ 0, 1 };1662 var a: [2:0]u32 = .{ 0, 1 };
1668 var b: [2]u32 = .{ 2, 3 };1663 var b: [2]u32 = .{ 2, 3 };
...@@ -1852,7 +1847,6 @@ test "peer type resolution: array and tuple" {...@@ -1852,7 +1847,6 @@ test "peer type resolution: array and tuple" {
1852 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1847 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1853 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1848 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1854 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1849 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1855 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
18561850
1857 var arr: [3]i32 = .{ 1, 2, 3 };1851 var arr: [3]i32 = .{ 1, 2, 3 };
1858 const tup = .{ 4, 5, 6 };1852 const tup = .{ 4, 5, 6 };
...@@ -1939,7 +1933,6 @@ test "peer type resolution: empty tuple pointer and slice" {...@@ -1939,7 +1933,6 @@ test "peer type resolution: empty tuple pointer and slice" {
1939 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1933 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1940 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1934 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1941 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1935 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1942 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19431936
1944 var a: [:0]const u8 = "Hello";1937 var a: [:0]const u8 = "Hello";
1945 var b = &.{};1938 var b = &.{};
...@@ -1959,7 +1952,6 @@ test "peer type resolution: tuple pointer and slice" {...@@ -1959,7 +1952,6 @@ test "peer type resolution: tuple pointer and slice" {
1959 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1952 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1960 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1953 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1961 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1954 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1962 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19631955
1964 var a: [:0]const u8 = "Hello";1956 var a: [:0]const u8 = "Hello";
1965 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };1957 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };
...@@ -1979,7 +1971,6 @@ test "peer type resolution: tuple pointer and optional slice" {...@@ -1979,7 +1971,6 @@ test "peer type resolution: tuple pointer and optional slice" {
1979 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO1971 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
1980 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO1972 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
1981 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO1973 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1982 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
19831974
1984 var a: ?[:0]const u8 = null;1975 var a: ?[:0]const u8 = null;
1985 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };1976 var b = &.{ @as(u8, 'x'), @as(u8, 'y'), @as(u8, 'z') };
...@@ -2117,7 +2108,6 @@ test "peer type resolution: pointer attributes are combined correctly" {...@@ -2117,7 +2108,6 @@ test "peer type resolution: pointer attributes are combined correctly" {
2117 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO2108 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
2118 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO2109 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
2119 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO2110 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2120 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest; // TODO
21212111
2122 var buf_a align(4) = "foo".*;2112 var buf_a align(4) = "foo".*;
2123 var buf_b align(4) = "bar".*;2113 var buf_b align(4) = "bar".*;
test/behavior/src.zig-1
...@@ -17,7 +17,6 @@ test "@src" {...@@ -17,7 +17,6 @@ test "@src" {
17 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO17 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
18 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO18 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
19 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO19 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
20 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
2120
22 try doTheTest();21 try doTheTest();
23}22}
test/behavior/struct.zig-1
...@@ -954,7 +954,6 @@ test "tuple element initialized with fn call" {...@@ -954,7 +954,6 @@ test "tuple element initialized with fn call" {
954 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO954 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
955 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO955 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
956 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO956 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
957 if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
958957
959 const S = struct {958 const S = struct {
960 fn doTheTest() !void {959 fn doTheTest() !void {