Merge branch 'master' into autodoc-searchkey

1 files changed, 17 insertions, 5 deletions

diff --git a/test/behavior/bool.zig b/test/behavior/bool.zig
index a4e0ab499a..a2636ecf42 100644
--- a/test/behavior/bool.zig
+++ b/test/behavior/bool.zig
@@ -1,5 +1,7 @@
 const std = @import("std");
+const builtin = @import("builtin");
 const expect = std.testing.expect;
+const expectEqual = std.testing.expectEqual;
 
 test "bool literals" {
     try expect(true);
@@ -7,16 +9,26 @@ test "bool literals" {
 }
 
 test "cast bool to int" {
+    if (builtin.zig_backend == .stage2_spirv64) return error.SkipZigTest;
+
     const t = true;
     const f = false;
-    try expect(@boolToInt(t) == @as(u32, 1));
-    try expect(@boolToInt(f) == @as(u32, 0));
+    try expectEqual(@as(u32, 1), @boolToInt(t));
+    try expectEqual(@as(u32, 0), @boolToInt(f));
+    try expectEqual(-1, @bitCast(i1, @boolToInt(t)));
+    try expectEqual(0, @bitCast(i1, @boolToInt(f)));
+    try expectEqual(u1, @TypeOf(@boolToInt(t)));
+    try expectEqual(u1, @TypeOf(@boolToInt(f)));
     try nonConstCastBoolToInt(t, f);
 }
 
 fn nonConstCastBoolToInt(t: bool, f: bool) !void {
-    try expect(@boolToInt(t) == @as(u32, 1));
-    try expect(@boolToInt(f) == @as(u32, 0));
+    try expectEqual(@as(u32, 1), @boolToInt(t));
+    try expectEqual(@as(u32, 0), @boolToInt(f));
+    try expectEqual(@as(i1, -1), @bitCast(i1, @boolToInt(t)));
+    try expectEqual(@as(i1, 0), @bitCast(i1, @boolToInt(f)));
+    try expectEqual(u1, @TypeOf(@boolToInt(t)));
+    try expectEqual(u1, @TypeOf(@boolToInt(f)));
 }
 
 test "bool cmp" {
@@ -37,7 +49,7 @@ test "compile time bool not" {
 
 test "short circuit" {
     try testShortCircuit(false, true);
-    comptime try testShortCircuit(false, true);
+    try comptime testShortCircuit(false, true);
 }
 
 fn testShortCircuit(f: bool, t: bool) !void {