| author | |
| committer | |
| log | 9c82f3ae6f96e41757cdb5985aae7793bd3907e4 |
| tree | f27163bcee18a7105859012310badeca8ebe225e |
| parent | cf5009f9af118716cbe97a28957cb1ca8d047f44 |
3 files changed, 9 insertions(+), 3 deletions(-)
test/behavior/basic.zig+4| ... | @@ -197,6 +197,9 @@ test "multiline string comments at multiple places" { | ... | @@ -197,6 +197,9 @@ test "multiline string comments at multiple places" { |
| 197 | } | 197 | } |
| 198 | 198 | ||
| 199 | test "string concatenation" { | 199 | test "string concatenation" { |
| 200 | if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest; | ||
| 201 | if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest; | ||
| 202 | |||
| 200 | try expect(mem.eql(u8, "OK" ++ " IT " ++ "WORKED", "OK IT WORKED")); | 203 | try expect(mem.eql(u8, "OK" ++ " IT " ++ "WORKED", "OK IT WORKED")); |
| 201 | } | 204 | } |
| 202 | 205 | ||
| ... | @@ -405,6 +408,7 @@ fn testTakeAddressOfParameter(f: f32) !void { | ... | @@ -405,6 +408,7 @@ fn testTakeAddressOfParameter(f: f32) !void { |
| 405 | 408 | ||
| 406 | test "pointer to void return type" { | 409 | test "pointer to void return type" { |
| 407 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO | 410 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO |
| 411 | if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest; | ||
| 408 | if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest; | 412 | if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest; |
| 409 | 413 | ||
| 410 | try testPointerToVoidReturnType(); | 414 | try testPointerToVoidReturnType(); |
test/behavior/cast.zig+3-2| ... | @@ -78,8 +78,9 @@ test "comptime_int @intToFloat" { | ... | @@ -78,8 +78,9 @@ test "comptime_int @intToFloat" { |
| 78 | try expect(@TypeOf(result) == f64); | 78 | try expect(@TypeOf(result) == f64); |
| 79 | try expect(result == 1234.0); | 79 | try expect(result == 1234.0); |
| 80 | } | 80 | } |
| 81 | if (builtin.zig_backend != .stage2_x86_64 or builtin.os.tag != .macos) { | 81 | |
| 82 | // TODO investigate why this traps on x86_64-macos | 82 | if (!((builtin.zig_backend == .stage2_aarch64 or builtin.zig_backend == .stage2_x86_64) and builtin.os.tag == .macos)) { |
| 83 | // TODO investigate why this traps on x86_64-macos and aarch64-macos | ||
| 83 | { | 84 | { |
| 84 | const result = @intToFloat(f128, 1234); | 85 | const result = @intToFloat(f128, 1234); |
| 85 | try expect(@TypeOf(result) == f128); | 86 | try expect(@TypeOf(result) == f128); |
test/behavior/struct.zig+2-1| ... | @@ -393,7 +393,8 @@ test "empty struct method call" { | ... | @@ -393,7 +393,8 @@ test "empty struct method call" { |
| 393 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO | 393 | if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO |
| 394 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO | 394 | if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO |
| 395 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO | 395 | if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest; // TODO |
| 396 | if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO | 396 | if (builtin.zig_backend == .stage2_aarch64 and builtin.os.tag == .macos) return error.SkipZigTest; // TODO |
| 397 | if (builtin.zig_backend == .stage2_x86_64 and builtin.os.tag == .macos) return error.SkipZigTest; // TODO | ||
| 397 | 398 | ||
| 398 | const es = EmptyStruct{}; | 399 | const es = EmptyStruct{}; |
| 399 | try expect(es.method() == 1234); | 400 | try expect(es.method() == 1234); |