Commit ab84ba39d03f59599ddfad91c00edf78a40edd70 | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-09-16 11:21:01-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-09-16 11:21:56-07:00
log	ab84ba39d03f59599ddfad91c00edf78a40edd70
tree	51f03581a27a454564ad7770333ee4d8bdf470d8
parent	dc214e041eda1461cc2317523e1656c5a0f55c1a

3 files changed, 12 insertions(+), 13 deletions(-)

test/behavior.zig+4-5

...	...	@@ -1,7 +1,6 @@
1	1	const builtin = @import("builtin");
2	2
3	3	test {
4		// Tests that pass for both.
5	4	_ = @import("behavior/bool.zig");
6	5	_ = @import("behavior/basic.zig");
7	6	_ = @import("behavior/generics.zig");
...	...	@@ -13,8 +12,10 @@ test {
13	12	_ = @import("behavior/usingnamespace.zig");
14	13	_ = @import("behavior/atomics.zig");
15	14
16		if (!builtin.zig_is_stage2) {
17		// Tests that only pass for stage1.
	15	if (builtin.zig_is_stage2) {
	16	// When all comptime_memory.zig tests pass, #9646 can be closed.
	17	// _ = @import("behavior/comptime_memory.zig");
	18	} else {
18	19	_ = @import("behavior/align.zig");
19	20	_ = @import("behavior/alignof.zig");
20	21	_ = @import("behavior/array_stage1.zig");
...	...	@@ -91,8 +92,6 @@ test {
91	92	_ = @import("behavior/byval_arg_var.zig");
92	93	_ = @import("behavior/call.zig");
93	94	_ = @import("behavior/cast_stage1.zig");
94		// When these tests pass, #9646 can be closed.
95		// _ = @import("behavior/comptime_memory.zig");
96	95	_ = @import("behavior/const_slice_child.zig");
97	96	_ = @import("behavior/defer.zig");
98	97	_ = @import("behavior/enum.zig");

test/behavior/atomics.zig+8

...	...	@@ -73,3 +73,11 @@ test "cmpxchg with ptr" {
73	73	try expect(@cmpxchgStrong(*i32, &x, &data3, &data2, .SeqCst, .SeqCst) == null);
74	74	try expect(x == &data2);
75	75	}
	76
	77	test "cmpxchg with ignored result" {
	78	var x: i32 = 1234;
	79
	80	_ = @cmpxchgStrong(i32, &x, 1234, 5678, .Monotonic, .Monotonic);
	81
	82	try expect(5678 == x);
	83	}

test/behavior/atomics_stage1.zig-8

...	...	@@ -28,14 +28,6 @@ fn test_u128_cmpxchg() !void {
28	28	try expect(x == 42);
29	29	}
30	30
31		test "cmpxchg with ignored result" {
32		var x: i32 = 1234;
33
34		_ = @cmpxchgStrong(i32, &x, 1234, 5678, .Monotonic, .Monotonic);
35
36		try expectEqual(@as(i32, 5678), x);
37		}
38
39	31	var a_global_variable = @as(u32, 1234);
40	32
41	33	test "cmpxchg on a global variable" {