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");...@@ -10,7 +10,7 @@ const builtin = @import("builtin");
10const print = std.debug.print;10const print = std.debug.print;
11const expect = std.testing.expect;11const expect = std.testing.expect;
12const expectEqual = std.testing.expectEqual;12const expectEqual = std.testing.expectEqual;
13const has_i128 = builtin.cpu.arch != .x86 and !builtin.cpu.arch.isARM() and13const has_i128 = builtin.cpu.arch != .i386 and !builtin.cpu.arch.isARM() and
14 !builtin.cpu.arch.isMIPS() and !builtin.cpu.arch.isPPC();14 !builtin.cpu.arch.isMIPS() and !builtin.cpu.arch.isPPC();
1515
16extern fn run_c_tests() void;16extern fn run_c_tests() void;
...@@ -896,7 +896,7 @@ pub export fn zig_ret_DC() DC {...@@ -896,7 +896,7 @@ pub export fn zig_ret_DC() DC {
896const CFF = extern struct { v1: u8, v2: f32, v3: f32 };896const CFF = extern struct { v1: u8, v2: f32, v3: f32 };
897897
898test "CFF: Zig passes to C" {898test "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;
900 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;900 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
901 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;901 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
902 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;902 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
...@@ -909,7 +909,7 @@ test "CFF: Zig returns to C" {...@@ -909,7 +909,7 @@ test "CFF: Zig returns to C" {
909 try expectOk(c_assert_ret_CFF());909 try expectOk(c_assert_ret_CFF());
910}910}
911test "CFF: C passes to Zig" {911test "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;
913 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;913 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
914 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;914 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
915 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;915 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
...@@ -942,27 +942,27 @@ pub export fn zig_ret_CFF() CFF {...@@ -942,27 +942,27 @@ pub export fn zig_ret_CFF() CFF {
942const PD = extern struct { v1: ?*anyopaque, v2: f64 };942const PD = extern struct { v1: ?*anyopaque, v2: f64 };
943943
944test "PD: Zig passes to C" {944test "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;
946 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;946 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
947 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;947 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
948 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;948 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
949 try expectOk(c_assert_PD(.{ .v1 = null, .v2 = 0.5 }));949 try expectOk(c_assert_PD(.{ .v1 = null, .v2 = 0.5 }));
950}950}
951test "PD: Zig returns to C" {951test "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;
953 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;953 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
954 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;954 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
955 try expectOk(c_assert_ret_PD());955 try expectOk(c_assert_ret_PD());
956}956}
957test "PD: C passes to Zig" {957test "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;
959 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;959 if (comptime builtin.cpu.arch.isMIPS()) return error.SkipZigTest;
960 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;960 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
961 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;961 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
962 try expectOk(c_send_PD());962 try expectOk(c_send_PD());
963}963}
964test "PD: C returns to Zig" {964test "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;
966 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;966 if (comptime builtin.cpu.arch.isPPC()) return error.SkipZigTest;
967 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;967 if (comptime builtin.cpu.arch.isPPC64()) return error.SkipZigTest;
968 try expectEqual(c_ret_PD(), .{ .v1 = null, .v2 = 0.5 });968 try expectEqual(c_ret_PD(), .{ .v1 = null, .v2 = 0.5 });