authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 22:43:10-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2023-01-09 22:43:10-07:00
logb9ea086812a080458446af94685a8b23eb3f3bc8
treeb70333203c6aeafb38711a697e11506627033ed5
parentb2cf10c5d51e351f5a729d20d7372ac90ebb6779

C ABI tests: fix merge conflict with x86/i386

1 files changed, 7 insertions(+), 7 deletions(-)

test/c_abi/main.zig+7-7
......@@ -10,7 +10,7 @@ const builtin = @import("builtin");
1010const print = std.debug.print;
1111const expect = std.testing.expect;
1212const expectEqual = std.testing.expectEqual;
13const has_i128 = builtin.cpu.arch != .x86 and !builtin.cpu.arch.isARM() and
13const has_i128 = builtin.cpu.arch != .i386 and !builtin.cpu.arch.isARM() and
1414 !builtin.cpu.arch.isMIPS() and !builtin.cpu.arch.isPPC();
1515
1616extern fn run_c_tests() void;
......@@ -896,7 +896,7 @@ pub export fn zig_ret_DC() DC {
896896const CFF = extern struct { v1: u8, v2: f32, v3: f32 };
897897
898898test "CFF: Zig passes to C" {
899 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
899 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
900900 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
901901 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
902902 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
......@@ -909,7 +909,7 @@ test "CFF: Zig returns to C" {
909909 try expectOk(c_assert_ret_CFF());
910910}
911911test "CFF: C passes to Zig" {
912 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
912 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
913913 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
914914 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
915915 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
......@@ -942,27 +942,27 @@ pub export fn zig_ret_CFF() CFF {
942942const PD = extern struct { v1: ?*anyopaque, v2: f64 };
943943
944944test "PD: Zig passes to C" {
945 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
945 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
946946 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
947947 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
948948 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
949949 try expectOk(c_assert_PD(.{ .v1 = null, .v2 = 0.5 }));
950950}
951951test "PD: Zig returns to C" {
952 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
952 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
953953 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
954954 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
955955 try expectOk(c_assert_ret_PD());
956956}
957957test "PD: C passes to Zig" {
958 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
958 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
959959 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
960960 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
961961 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
962962 try expectOk(c_send_PD());
963963}
964964test "PD: C returns to Zig" {
965 if (builtin.target.cpu.arch == .x86) return error.SkipZigTest;
965 if (builtin.target.cpu.arch == .i386) return error.SkipZigTest;
966966 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
967967 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
968968 try expectEqual(c_ret_PD(), .{ .v1 = null, .v2 = 0.5 });