Skip to content

Commit 71e2a56

Browse files
andrewrkandrewrk
committed
mark some more behavior tests as passing
1 parent 8373520 commit 71e2a56

File tree

4 files changed

+12
-73
lines changed

4 files changed

+12
-73
lines changed

‎test/behavior/align.zig

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -435,10 +435,8 @@ var default_aligned_global = DefaultAligned{
435435
};
436436

437437
test "read 128-bit field from default aligned struct in global memory" {
438-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
439-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
440-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
441438
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
439+
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
442440
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
443441

444442
try expect(12 == default_aligned_global.badguy);
@@ -465,12 +463,7 @@ test "struct field explicit alignment" {
465463
}
466464

467465
test "align(@alignOf(T)) T does not force resolution of T" {
468-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
469-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
470-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
471-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
472-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
473-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
466+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
474467

475468
const S = struct {
476469
const A = struct {

‎test/behavior/bitcast.zig

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,6 @@ test "comptime bitcast used in expression has the correct type" {
245245
}
246246

247247
test "bitcast passed as tuple element" {
248-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
249-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
250-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
251-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
252-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
253-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
254-
255248
const S = struct {
256249
fn foo(args: anytype) !void {
257250
comptime try expect(@TypeOf(args[0]) == f32);

‎test/behavior/packed-struct.zig

Lines changed: 7 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ const expectEqual = std.testing.expectEqual;
55
const native_endian = builtin.cpu.arch.endian();
66

77
test "correct size of packed structs" {
8-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
9-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
10-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
11-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
12-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
13-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
14-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
15-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
16-
178
const T1 = packed struct { one: u8, three: [3]u8 };
189

1910
try expectEqual(4, @sizeOf(T1));
@@ -41,14 +32,7 @@ test "correct size of packed structs" {
4132
}
4233

4334
test "flags in packed structs" {
44-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
45-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
46-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
47-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
48-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
49-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
50-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
51-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
35+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
5236

5337
const Flags1 = packed struct {
5438
// byte 0
@@ -134,14 +118,7 @@ test "flags in packed structs" {
134118
}
135119

136120
test "arrays in packed structs" {
137-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
138-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
139-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
140-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
141-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
142-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
143-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
144-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
121+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
145122

146123
const T1 = packed struct { array: [3][3]u8 };
147124
const T2 = packed struct { array: [9]u8 };
@@ -153,14 +130,7 @@ test "arrays in packed structs" {
153130
}
154131

155132
test "consistent size of packed structs" {
156-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
157-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
158-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
159-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
160-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
161-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
162-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
163-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
133+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
164134

165135
const TxData1 = packed struct { data: u8, _23: u23, full: bool = false };
166136
const TxData2 = packed struct { data: u9, _22: u22, full: bool = false };
@@ -196,14 +166,7 @@ test "consistent size of packed structs" {
196166
}
197167

198168
test "correct sizeOf and offsets in packed structs" {
199-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
200-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
201-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
202-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
203-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
204-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
205-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
206-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
169+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
207170

208171
const PStruct = packed struct {
209172
bool_a: bool,
@@ -274,14 +237,7 @@ test "correct sizeOf and offsets in packed structs" {
274237
}
275238

276239
test "nested packed structs" {
277-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
278-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
279-
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
280-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
281-
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
282-
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
283-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
284-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
240+
if (builtin.zig_backend != .stage1) return error.SkipZigTest;
285241

286242
const S1 = packed struct { a: u8, b: u8, c: u8 };
287243

@@ -324,14 +280,11 @@ test "nested packed structs" {
324280
}
325281

326282
test "regular in irregular packed struct" {
327-
if (builtin.zig_backend == .stage2_llvm) return error.SkipZigTest;
328-
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
329283
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
330-
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
284+
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
331285
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
332286
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
333-
if (builtin.zig_backend == .stage2_x86) return error.SkipZigTest;
334-
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest;
287+
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
335288

336289
const Irregular = packed struct {
337290
bar: Regular = Regular{},

‎test/behavior/shuffle.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ test "@shuffle int" {
4444
comptime try S.doTheTest();
4545
}
4646

47-
test "@shuffle bool" {
47+
test "@shuffle bool 1" {
4848
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
4949
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
5050
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
@@ -60,11 +60,11 @@ test "@shuffle bool" {
6060
try expect(mem.eql(bool, &@as([4]bool, res), &[4]bool{ false, false, true, false }));
6161
}
6262
};
63-
if (builtin.zig_backend == .stage1) try S.doTheTest();
63+
try S.doTheTest();
6464
comptime try S.doTheTest();
6565
}
6666

67-
test "@shuffle bool" {
67+
test "@shuffle bool 2" {
6868
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
6969
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
7070
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO

0 commit comments

Comments
 (0)