Skip to content

Commit 52066bf

Browse files
kubkonkubkon
committed
x86_64+macho: pass more behavior tests
1 parent db6addf commit 52066bf

19 files changed

+98
-98
lines changed

‎test/behavior/abs.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ test "@abs floats" {
9494
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
9595
if (builtin.zig_backend == .stage2_riscv64) return error.SkipZigTest; // TODO
9696
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
97-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
97+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
9898

9999
try comptime testAbsFloats(f16);
100100
try testAbsFloats(f16);

‎test/behavior/basic.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ test "extern variable with non-pointer opaque type" {
757757
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
758758
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
759759
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
760-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
760+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
761761

762762
@export(var_to_export, .{ .name = "opaque_extern_var" });
763763
try expect(@as(*align(1) u32, @ptrCast(&opaque_extern_var)).* == 42);

‎test/behavior/bitcast.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ test "@bitCast packed struct of floats" {
298298
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
299299
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
300300
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
301-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
301+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
302302

303303
const Foo = packed struct {
304304
a: f16 = 0,
@@ -336,7 +336,7 @@ test "comptime @bitCast packed struct to int and back" {
336336
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
337337
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
338338
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
339-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
339+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
340340

341341
if (builtin.zig_backend == .stage2_llvm and native_endian == .big) {
342342
// https://github.com/ziglang/zig/issues/13782
@@ -379,7 +379,7 @@ test "comptime bitcast with fields following f80" {
379379
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
380380
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
381381
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
382-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
382+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
383383

384384
const FloatT = extern struct { f: f80, x: u128 align(16) };
385385
const x: FloatT = .{ .f = 0.5, .x = 123 };
@@ -420,7 +420,7 @@ test "bitcast nan float does not modify signaling bit" {
420420
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
421421
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
422422
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
423-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
423+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
424424

425425
// TODO: https://github.com/ziglang/zig/issues/14366
426426
if (builtin.zig_backend == .stage2_llvm and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;

‎test/behavior/bitreverse.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ test "@bitReverse" {
1515
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
1616
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1717
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
18-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
18+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
1919

2020
try comptime testBitReverse();
2121
try testBitReverse();

‎test/behavior/byteswap.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ test "@byteSwap integers" {
88
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
99
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
1010
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
11-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
11+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
1212

1313
const ByteSwapIntTest = struct {
1414
fn run() !void {

‎test/behavior/cast.zig

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ test "@floatFromInt(f80)" {
125125
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
126126
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
127127
if (builtin.zig_backend == .stage2_c and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
128-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
128+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
129129

130130
const S = struct {
131131
fn doTheTest(comptime Int: type) !void {
@@ -1363,7 +1363,7 @@ test "cast f16 to wider types" {
13631363
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
13641364
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
13651365
if (builtin.zig_backend == .stage2_c and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
1366-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
1366+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
13671367

13681368
const S = struct {
13691369
fn doTheTest() !void {
@@ -1383,7 +1383,7 @@ test "cast f128 to narrower types" {
13831383
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
13841384
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
13851385
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1386-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
1386+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
13871387

13881388
const S = struct {
13891389
fn doTheTest() !void {
@@ -1473,7 +1473,7 @@ test "coerce between pointers of compatible differently-named floats" {
14731473
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
14741474
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
14751475
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
1476-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
1476+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
14771477

14781478
if (builtin.zig_backend == .stage2_llvm and builtin.os.tag == .windows) {
14791479
// https://github.com/ziglang/zig/issues/12396
@@ -1641,7 +1641,7 @@ test "peer type resolution: float and comptime-known fixed-width integer" {
16411641
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
16421642
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
16431643
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
1644-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
1644+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
16451645

16461646
const i: u8 = 100;
16471647
var f: f32 = 1.234;
@@ -2318,7 +2318,7 @@ test "@floatCast on vector" {
23182318
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
23192319
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
23202320
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2321-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
2321+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
23222322

23232323
const S = struct {
23242324
fn doTheTest() !void {
@@ -2384,7 +2384,7 @@ test "@floatFromInt on vector" {
23842384
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
23852385
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
23862386
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2387-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
2387+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
23882388

23892389
const S = struct {
23902390
fn doTheTest() !void {
@@ -2438,7 +2438,7 @@ test "@intFromBool on vector" {
24382438
}
24392439

24402440
test "numeric coercions with undefined" {
2441-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
2441+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
24422442

24432443
const from: i32 = undefined;
24442444
var to: f32 = from;
@@ -2460,7 +2460,7 @@ test "@as does not corrupt values with incompatible representations" {
24602460
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO
24612461
if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO
24622462
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
2463-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
2463+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
24642464

24652465
const x: f32 = @as(f16, blk: {
24662466
if (false) {

‎test/behavior/eval.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ test "runtime 128 bit integer division" {
521521
if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest; // TODO
522522
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
523523
if (builtin.zig_backend == .stage2_c and comptime builtin.cpu.arch.isArmOrThumb()) return error.SkipZigTest;
524-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
524+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
525525

526526
var a: u128 = 152313999999999991610955792383;
527527
var b: u128 = 10000000000000000000;

‎test/behavior/extern.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export var a_mystery_symbol: i32 = 1234;
1717
test "function extern symbol" {
1818
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest;
1919
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest;
20-
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf) return error.SkipZigTest;
20+
if (builtin.zig_backend == .stage2_x86_64 and builtin.target.ofmt != .elf and builtin.target.ofmt != .macho) return error.SkipZigTest;
2121
if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
2222

2323
const a = @extern(*const fn () callconv(.C) i32, .{ .name = "a_mystery_function" });

0 commit comments

Comments
 (0)