authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-12-10 15:07:51-05:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2022-12-10 15:07:51-05:00
logf1f17dc1c744defa89f65b2dc642ca0c1b7c1e44
tree0f6bb6aa65a369d1c634e457719c72ba15b5dc28
parent023b597ab4a74adbbe658bd7476fa5d20b02a133
parent654e30069d5886d558dfa5f513836e4bee034545
signature Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #13810 from r00ster91/old

Re-enable many previously failing tests and add test coverage

21 files changed, 289 insertions(+), 62 deletions(-)

doc/langref.html.in-4
......@@ -6242,10 +6242,6 @@ test "implicit unsigned integer to signed integer" {
62426242}
62436243
62446244test "float widening" {
6245 // Note: there is an open issue preventing this from working on aarch64:
6246 // https://github.com/ziglang/zig/issues/3282
6247 if (builtin.target.cpu.arch == .aarch64) return error.SkipZigTest;
6248
62496245 var a: f16 = 12.34;
62506246 var b: f32 = a;
62516247 var c: f64 = b;
lib/std/fmt/parse_float.zig-5
......@@ -70,11 +70,6 @@ test "fmt.parseFloat" {
7070}
7171
7272test "fmt.parseFloat nan and inf" {
73 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
74 // https://github.com/ziglang/zig/issues/12027
75 return error.SkipZigTest;
76 }
77
7873 inline for ([_]type{ f16, f32, f64, f128 }) |T| {
7974 const Z = std.meta.Int(.unsigned, @typeInfo(T).Float.bits);
8075
lib/std/math.zig-16
......@@ -523,10 +523,6 @@ pub fn shl(comptime T: type, a: T, shift_amt: anytype) T {
523523}
524524
525525test "shl" {
526 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
527 // https://github.com/ziglang/zig/issues/12012
528 return error.SkipZigTest;
529 }
530526 try testing.expect(shl(u8, 0b11111111, @as(usize, 3)) == 0b11111000);
531527 try testing.expect(shl(u8, 0b11111111, @as(usize, 8)) == 0);
532528 try testing.expect(shl(u8, 0b11111111, @as(usize, 9)) == 0);
......@@ -567,10 +563,6 @@ pub fn shr(comptime T: type, a: T, shift_amt: anytype) T {
567563}
568564
569565test "shr" {
570 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
571 // https://github.com/ziglang/zig/issues/12012
572 return error.SkipZigTest;
573 }
574566 try testing.expect(shr(u8, 0b11111111, @as(usize, 3)) == 0b00011111);
575567 try testing.expect(shr(u8, 0b11111111, @as(usize, 8)) == 0);
576568 try testing.expect(shr(u8, 0b11111111, @as(usize, 9)) == 0);
......@@ -612,10 +604,6 @@ pub fn rotr(comptime T: type, x: T, r: anytype) T {
612604}
613605
614606test "rotr" {
615 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
616 // https://github.com/ziglang/zig/issues/12012
617 return error.SkipZigTest;
618 }
619607 try testing.expect(rotr(u0, 0b0, @as(usize, 3)) == 0b0);
620608 try testing.expect(rotr(u5, 0b00001, @as(usize, 0)) == 0b00001);
621609 try testing.expect(rotr(u6, 0b000001, @as(usize, 7)) == 0b100000);
......@@ -656,10 +644,6 @@ pub fn rotl(comptime T: type, x: T, r: anytype) T {
656644}
657645
658646test "rotl" {
659 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
660 // https://github.com/ziglang/zig/issues/12012
661 return error.SkipZigTest;
662 }
663647 try testing.expect(rotl(u0, 0b0, @as(usize, 3)) == 0b0);
664648 try testing.expect(rotl(u5, 0b00001, @as(usize, 0)) == 0b00001);
665649 try testing.expect(rotl(u6, 0b000001, @as(usize, 7)) == 0b000010);
lib/std/segmented_list.zig+1-4
......@@ -412,10 +412,7 @@ pub fn SegmentedList(comptime T: type, comptime prealloc_item_count: usize) type
412412}
413413
414414test "SegmentedList basic usage" {
415 if (false) {
416 // https://github.com/ziglang/zig/issues/11787
417 try testSegmentedList(0);
418 }
415 try testSegmentedList(0);
419416 try testSegmentedList(1);
420417 try testSegmentedList(2);
421418 try testSegmentedList(4);
lib/std/simd.zig-4
......@@ -191,10 +191,6 @@ pub fn extract(
191191}
192192
193193test "vector patterns" {
194 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
195 // https://github.com/ziglang/zig/issues/12012
196 return error.SkipZigTest;
197 }
198194 const base = @Vector(4, u32){ 10, 20, 30, 40 };
199195 const other_base = @Vector(4, u32){ 55, 66, 77, 88 };
200196
test/behavior.zig+9
......@@ -43,7 +43,9 @@ test {
4343 _ = @import("behavior/bugs/2346.zig");
4444 _ = @import("behavior/bugs/2557.zig");
4545 _ = @import("behavior/bugs/2578.zig");
46 _ = @import("behavior/bugs/2622.zig");
4647 _ = @import("behavior/bugs/2692.zig");
48 _ = @import("behavior/bugs/2727.zig");
4749 _ = @import("behavior/bugs/2889.zig");
4850 _ = @import("behavior/bugs/3007.zig");
4951 _ = @import("behavior/bugs/3046.zig");
......@@ -62,16 +64,22 @@ test {
6264 _ = @import("behavior/bugs/5413.zig");
6365 _ = @import("behavior/bugs/5474.zig");
6466 _ = @import("behavior/bugs/5487.zig");
67 _ = @import("behavior/bugs/6047.zig");
6568 _ = @import("behavior/bugs/6456.zig");
6669 _ = @import("behavior/bugs/6781.zig");
6770 _ = @import("behavior/bugs/6850.zig");
71 _ = @import("behavior/bugs/6905.zig");
72 _ = @import("behavior/bugs/6947.zig");
6873 _ = @import("behavior/bugs/7003.zig");
6974 _ = @import("behavior/bugs/7047.zig");
7075 _ = @import("behavior/bugs/7187.zig");
76 _ = @import("behavior/bugs/7325.zig");
77 _ = @import("behavior/bugs/8646.zig");
7178 _ = @import("behavior/bugs/9584.zig");
7279 _ = @import("behavior/bugs/10138.zig");
7380 _ = @import("behavior/bugs/10147.zig");
7481 _ = @import("behavior/bugs/10970.zig");
82 _ = @import("behavior/bugs/10684.zig");
7583 _ = @import("behavior/bugs/11046.zig");
7684 _ = @import("behavior/bugs/11100.zig");
7785 _ = @import("behavior/bugs/11139.zig");
......@@ -81,6 +89,7 @@ test {
8189 _ = @import("behavior/bugs/11179.zig");
8290 _ = @import("behavior/bugs/11181.zig");
8391 _ = @import("behavior/bugs/11213.zig");
92 _ = @import("behavior/bugs/11787.zig");
8493 _ = @import("behavior/bugs/11816.zig");
8594 _ = @import("behavior/bugs/12003.zig");
8695 _ = @import("behavior/bugs/12025.zig");
test/behavior/atomics.zig-11
......@@ -151,11 +151,6 @@ test "cmpxchg on a global variable" {
151151 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
152152 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
153153
154 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
155 // https://github.com/ziglang/zig/issues/10627
156 return error.SkipZigTest;
157 }
158
159154 _ = @cmpxchgWeak(u32, &a_global_variable, 1234, 42, .Acquire, .Monotonic);
160155 try expect(a_global_variable == 42);
161156}
......@@ -218,12 +213,6 @@ test "atomicrmw with floats" {
218213 if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
219214 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
220215
221 if ((builtin.zig_backend == .stage2_llvm or builtin.zig_backend == .stage2_c) and
222 builtin.cpu.arch == .aarch64)
223 {
224 // https://github.com/ziglang/zig/issues/10627
225 return error.SkipZigTest;
226 }
227216 try testAtomicRmwFloat();
228217 comptime try testAtomicRmwFloat();
229218}
test/behavior/bugs/10684.zig created+19
......@@ -0,0 +1,19 @@
1const std = @import("std");
2const builtin = @import("builtin");
3const expectEqualStrings = std.testing.expectEqualStrings;
4
5test "slicing slices" {
6 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
7 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
10 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11
12 const foo = "1234";
13 const bar = foo[0..4];
14 try expectEqualStrings("1234", bar);
15 try expectEqualStrings("2", bar[1..2]);
16 try expectEqualStrings("3", bar[2..3]);
17 try expectEqualStrings("4", bar[3..4]);
18 try expectEqualStrings("34", bar[2..4]);
19}
test/behavior/bugs/11787.zig created+20
......@@ -0,0 +1,20 @@
1const std = @import("std");
2const builtin = @import("builtin");
3const testing = std.testing;
4
5test "slicing zero length array field of struct" {
6 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
7 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
10 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11
12 const S = struct {
13 a: [0]usize,
14 fn foo(self: *@This(), start: usize, end: usize) []usize {
15 return self.a[start..end];
16 }
17 };
18 var s: S = undefined;
19 try testing.expect(s.foo(0, 0).len == 0);
20}
test/behavior/bugs/2622.zig created+16
......@@ -0,0 +1,16 @@
1const builtin = @import("builtin");
2
3var buf: []u8 = undefined;
4
5test "reslice of undefined global var slice" {
6 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
7 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
10 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
11
12 var mem: [100]u8 = [_]u8{0} ** 100;
13 buf = &mem;
14 const x = buf[0..1];
15 try @import("std").testing.expect(x.len == 1 and x[0] == 0);
16}
test/behavior/bugs/2727.zig created+18
......@@ -0,0 +1,18 @@
1const builtin = @import("builtin");
2
3fn t() bool {
4 return true;
5}
6
7test {
8 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
10 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
11 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
12 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
13
14 comptime var i: usize = 0;
15 inline while (i < 2) : (i += 1) {
16 if (t()) {} else return;
17 }
18}
test/behavior/bugs/6047.zig created+20
......@@ -0,0 +1,20 @@
1const builtin = @import("builtin");
2
3fn getError() !void {
4 return error.Test;
5}
6
7fn getError2() !void {
8 var a: u8 = 'c';
9 try if (a == 'a') getError() else if (a == 'b') getError() else getError();
10}
11
12test "`try`ing an if/else expression" {
13 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
14 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
15 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
16 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
17 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
18
19 try @import("std").testing.expectError(error.Test, getError2());
20}
test/behavior/bugs/6905.zig created+23
......@@ -0,0 +1,23 @@
1const expect = @import("std").testing.expect;
2const builtin = @import("builtin");
3
4test "sentinel-terminated 0-length slices" {
5 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
6 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
7 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
8 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
10
11 var u32s: [4]u32 = [_]u32{ 0, 1, 2, 3 };
12
13 var index: u8 = 2;
14 var slice = u32s[index..index :2];
15 var array_ptr = u32s[2..2 :2];
16 const comptime_known_array_value = u32s[2..2 :2].*;
17 var runtime_array_value = u32s[2..2 :2].*;
18
19 try expect(slice[0] == 2);
20 try expect(array_ptr[0] == 2);
21 try expect(comptime_known_array_value[0] == 2);
22 try expect(runtime_array_value[0] == 2);
23}
test/behavior/bugs/6947.zig created+16
......@@ -0,0 +1,16 @@
1const builtin = @import("builtin");
2
3fn destroy(ptr: *void) void {
4 _ = ptr;
5}
6
7test {
8 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
9 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
10 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
11 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
12 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
13
14 var slice: []void = undefined;
15 destroy(&slice[0]);
16}
test/behavior/bugs/7325.zig created+113
......@@ -0,0 +1,113 @@
1const std = @import("std");
2const builtin = @import("builtin");
3const testing = std.testing;
4
5const string = "hello world";
6
7const TempRef = struct {
8 index: usize,
9 is_weak: bool,
10};
11
12const BuiltinEnum = struct {
13 name: []const u8,
14};
15
16const ParamType = union(enum) {
17 boolean,
18 buffer,
19 one_of: BuiltinEnum,
20};
21
22const CallArg = struct {
23 value: Expression,
24};
25
26const Expression = union(enum) {
27 literal_boolean: bool,
28 literal_enum_value: EnumLiteral,
29};
30
31const EnumLiteral = struct {
32 label: []const u8,
33};
34
35const ExpressionResult = union(enum) {
36 temp_buffer: TempRef,
37 literal_boolean: bool,
38 literal_enum_value: []const u8,
39};
40
41fn commitCalleeParam(result: ExpressionResult, callee_param_type: ParamType) ExpressionResult {
42 switch (callee_param_type) {
43 .boolean => {
44 return result;
45 },
46 .buffer => {
47 return ExpressionResult{
48 .temp_buffer = .{ .index = 0, .is_weak = false },
49 };
50 },
51 .one_of => {
52 return result;
53 },
54 }
55}
56
57fn genExpression(expr: Expression) !ExpressionResult {
58 switch (expr) {
59 .literal_boolean => |value| {
60 return ExpressionResult{
61 .literal_boolean = value,
62 };
63 },
64 .literal_enum_value => |v| {
65 try testing.expectEqualStrings(string, v.label);
66 const result: ExpressionResult = .{
67 .literal_enum_value = v.label,
68 };
69 switch (result) {
70 .literal_enum_value => |w| {
71 try testing.expectEqualStrings(string, w);
72 },
73 else => {},
74 }
75 return result;
76 },
77 }
78}
79
80test {
81 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
82 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
83 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
84 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
85 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
86
87 var param: ParamType = .{
88 .one_of = .{ .name = "name" },
89 };
90 var arg: CallArg = .{
91 .value = .{
92 .literal_enum_value = .{
93 .label = string,
94 },
95 },
96 };
97
98 const result = try genExpression(arg.value);
99 switch (result) {
100 .literal_enum_value => |w| {
101 try testing.expectEqualStrings(string, w);
102 },
103 else => {},
104 }
105
106 const derp = commitCalleeParam(result, param);
107 switch (derp) {
108 .literal_enum_value => |w| {
109 try testing.expectEqualStrings(string, w);
110 },
111 else => {},
112 }
113}
test/behavior/bugs/8646.zig created+18
......@@ -0,0 +1,18 @@
1const std = @import("std");
2const builtin = @import("builtin");
3
4const array = [_][]const []const u8{
5 &.{"hello"},
6 &.{ "world", "hello" },
7};
8
9test {
10 if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
11 if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
12 if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest; // TODO
13 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
14 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
15
16 try std.testing.expect(array[0].len == 1);
17 try std.testing.expectEqualStrings("hello", array[0][0]);
18}
test/behavior/int128.zig+5
......@@ -53,6 +53,11 @@ test "int128" {
5353
5454 buff = -0x12341234123412341234123412341234;
5555 try expect(-buff == 0x12341234123412341234123412341234);
56
57 const a: i128 = -170141183460469231731687303715884105728;
58 const b: i128 = -0x8000_0000_0000_0000_0000_0000_0000_0000;
59 try expect(@divFloor(b, 1_000_000) == -170141183460469231731687303715885);
60 try expect(a == b);
5661}
5762
5863test "truncate int128" {
test/behavior/math.zig-6
......@@ -161,12 +161,6 @@ test "@ctz vectors" {
161161 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
162162 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
163163
164 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
165 // This regressed with LLVM 14:
166 // https://github.com/ziglang/zig/issues/12013
167 return error.SkipZigTest;
168 }
169
170164 try testCtzVectors();
171165 comptime try testCtzVectors();
172166}
test/behavior/vector.zig-6
......@@ -174,12 +174,6 @@ test "tuple to vector" {
174174 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
175175 if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
176176
177 if (builtin.zig_backend == .stage2_llvm and builtin.cpu.arch == .aarch64) {
178 // Regressed with LLVM 14:
179 // https://github.com/ziglang/zig/issues/12012
180 return error.SkipZigTest;
181 }
182
183177 const S = struct {
184178 fn doTheTest() !void {
185179 const Vec3 = @Vector(3, i32);
test/behavior/widening.zig-4
......@@ -60,10 +60,6 @@ test "float widening f16 to f128" {
6060 if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
6161 if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
6262
63 // TODO https://github.com/ziglang/zig/issues/3282
64 if (builtin.cpu.arch == .aarch64) return error.SkipZigTest;
65 if (builtin.cpu.arch == .powerpc64le) return error.SkipZigTest;
66
6763 var x: f16 = 12.34;
6864 var y: f128 = x;
6965 try expect(x == y);
test/cases/compile_errors/invalid_store_to_comptime_field.zig+11-2
......@@ -41,7 +41,7 @@ pub export fn entry4() void {
4141 _ = U.foo(.{ .foo = 2, .bar = 2 });
4242}
4343pub export fn entry5() void {
44 comptime var y = .{ 1, 2};
44 comptime var y = .{ 1, 2 };
4545 y = .{ 3, 4 };
4646}
4747// pub export fn entry5() void {
......@@ -52,7 +52,15 @@ pub export fn entry5() void {
5252// };
5353// _ = S.foo(.{ -1234, 5679, x });
5454// }
55
55pub export fn entry6() void {
56 const State = struct {
57 comptime id: bool = true,
58 fn init(comptime id: bool) @This() {
59 return @This(){ .id = id };
60 }
61 };
62 _ = State.init(false);
63}
5664
5765// error
5866// target=native
......@@ -65,3 +73,4 @@ pub export fn entry5() void {
6573// :25:29: note: default value set here
6674// :41:16: error: value stored in comptime field does not match the default value of the field
6775// :45:12: error: value stored in comptime field does not match the default value of the field
76// :59:35: error: value stored in comptime field does not match the default value of the field