From acf16b5fb34e3ce985df16cba1be1455492e4564 Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Fri, 14 Jun 2019 13:32:04 -0400
Subject: [PATCH] uncomment more passing tests

---
 BRANCH_TODO                       |  1 +
 test/stage1/behavior.zig          | 20 +++++++-------
 test/stage1/behavior/cast.zig     | 16 +++++------
 test/stage1/behavior/eval.zig     | 44 +++++++++++++++----------------
 test/stage1/behavior/generics.zig | 26 +++++++++---------
 test/stage1/behavior/misc.zig     | 14 +++++-----
 test/stage1/behavior/optional.zig | 10 +++----
 test/stage1/behavior/ptrcast.zig  | 14 +++++-----
 test/stage1/behavior/while.zig    | 44 +++++++++++++++----------------
 9 files changed, 95 insertions(+), 94 deletions(-)

diff --git a/BRANCH_TODO b/BRANCH_TODO
index c392e8ae7..79616923b 100644
--- a/BRANCH_TODO
+++ b/BRANCH_TODO
@@ -2,6 +2,7 @@ Scratch pad for stuff to do before merging master
 =================================================
 
 uncomment all the behavior tests
+diff master branch to make sure
 
 restore test_runner.zig to master branch
  - also the default panic function and unexpected_error_tracing. see the commit
diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig
index 1dd090cbc..411785a5c 100644
--- a/test/stage1/behavior.zig
+++ b/test/stage1/behavior.zig
@@ -40,20 +40,20 @@ comptime {
     //_ = @import("behavior/bugs/920.zig");
     _ = @import("behavior/byval_arg_var.zig");
     //_ = @import("behavior/cancel.zig");
-    //_ = @import("behavior/cast.zig");
+    _ = @import("behavior/cast.zig"); // TODO
     _ = @import("behavior/const_slice_child.zig");
     //_ = @import("behavior/coroutine_await_struct.zig");
     //_ = @import("behavior/coroutines.zig");
     _ = @import("behavior/defer.zig");
-    //_ = @import("behavior/enum.zig");
-    //_ = @import("behavior/enum_with_members.zig");
+    _ = @import("behavior/enum.zig");
+    _ = @import("behavior/enum_with_members.zig");
     //_ = @import("behavior/error.zig");
-    //_ = @import("behavior/eval.zig");
+    _ = @import("behavior/eval.zig"); // TODO
     _ = @import("behavior/field_parent_ptr.zig");
     _ = @import("behavior/fn.zig");
     _ = @import("behavior/fn_in_struct_in_comptime.zig");
     _ = @import("behavior/for.zig");
-    //_ = @import("behavior/generics.zig");
+    _ = @import("behavior/generics.zig"); // TODO
     _ = @import("behavior/hasdecl.zig");
     _ = @import("behavior/if.zig");
     //_ = @import("behavior/import.zig");
@@ -61,15 +61,15 @@ comptime {
     _ = @import("behavior/inttoptr.zig");
     _ = @import("behavior/ir_block_deps.zig");
     //_ = @import("behavior/math.zig");
-    //_ = @import("behavior/merge_error_sets.zig");
-    //_ = @import("behavior/misc.zig");
+    _ = @import("behavior/merge_error_sets.zig");
+    _ = @import("behavior/misc.zig"); // TODO
     _ = @import("behavior/namespace_depends_on_compile_var.zig");
     _ = @import("behavior/new_stack_call.zig");
     _ = @import("behavior/null.zig");
-    //_ = @import("behavior/optional.zig");
+    _ = @import("behavior/optional.zig"); // TODO
     //_ = @import("behavior/pointers.zig");
     _ = @import("behavior/popcount.zig");
-    //_ = @import("behavior/ptrcast.zig");
+    _ = @import("behavior/ptrcast.zig"); // TODO
     _ = @import("behavior/pub_enum.zig");
     _ = @import("behavior/ref_var_in_if_after_if_2nd_switch_prong.zig");
     _ = @import("behavior/reflection.zig");
@@ -94,6 +94,6 @@ comptime {
     _ = @import("behavior/var_args.zig");
     _ = @import("behavior/vector.zig");
     _ = @import("behavior/void.zig");
-    //_ = @import("behavior/while.zig");
+    _ = @import("behavior/while.zig"); // TODO
     _ = @import("behavior/widening.zig");
 }
diff --git a/test/stage1/behavior/cast.zig b/test/stage1/behavior/cast.zig
index 0a2ffb6c2..f659f6d9a 100644
--- a/test/stage1/behavior/cast.zig
+++ b/test/stage1/behavior/cast.zig
@@ -124,14 +124,14 @@ fn returnNullLitFromOptionalTypeErrorRef() anyerror!?*A {
     return null;
 }
 
-test "peer type resolution: ?T and T" {
-    expect(peerTypeTAndOptionalT(true, false).? == 0);
-    expect(peerTypeTAndOptionalT(false, false).? == 3);
-    comptime {
-        expect(peerTypeTAndOptionalT(true, false).? == 0);
-        expect(peerTypeTAndOptionalT(false, false).? == 3);
-    }
-}
+//test "peer type resolution: ?T and T" {
+//    expect(peerTypeTAndOptionalT(true, false).? == 0);
+//    expect(peerTypeTAndOptionalT(false, false).? == 3);
+//    comptime {
+//        expect(peerTypeTAndOptionalT(true, false).? == 0);
+//        expect(peerTypeTAndOptionalT(false, false).? == 3);
+//    }
+//}
 fn peerTypeTAndOptionalT(c: bool, b: bool) ?usize {
     if (c) {
         return if (b) null else usize(0);
diff --git a/test/stage1/behavior/eval.zig b/test/stage1/behavior/eval.zig
index b575d1608..595e83b08 100644
--- a/test/stage1/behavior/eval.zig
+++ b/test/stage1/behavior/eval.zig
@@ -176,9 +176,9 @@ test "const slice" {
     }
 }
 
-test "try to trick eval with runtime if" {
-    expect(testTryToTrickEvalWithRuntimeIf(true) == 10);
-}
+//test "try to trick eval with runtime if" {
+//    expect(testTryToTrickEvalWithRuntimeIf(true) == 10);
+//}
 
 fn testTryToTrickEvalWithRuntimeIf(b: bool) usize {
     comptime var i: usize = 0;
@@ -572,14 +572,14 @@ pub const Info = struct {
 
 pub const diamond_info = Info{ .version = 0 };
 
-test "comptime modification of const struct field" {
-    comptime {
-        var res = diamond_info;
-        res.version = 1;
-        expect(diamond_info.version == 0);
-        expect(res.version == 1);
-    }
-}
+//test "comptime modification of const struct field" {
+//    comptime {
+//        var res = diamond_info;
+//        res.version = 1;
+//        expect(diamond_info.version == 0);
+//        expect(res.version == 1);
+//    }
+//}
 
 test "pointer to type" {
     comptime {
@@ -657,9 +657,9 @@ fn loopNTimes(comptime n: usize) void {
     inline while (i < n) : (i += 1) {}
 }
 
-test "variable inside inline loop that has different types on different iterations" {
-    testVarInsideInlineLoop(true, u32(42));
-}
+//test "variable inside inline loop that has different types on different iterations" {
+//    testVarInsideInlineLoop(true, u32(42));
+//}
 
 fn testVarInsideInlineLoop(args: ...) void {
     comptime var i = 0;
@@ -670,14 +670,14 @@ fn testVarInsideInlineLoop(args: ...) void {
     }
 }
 
-test "inline for with same type but different values" {
-    var res: usize = 0;
-    inline for ([_]type{ [2]u8, [1]u8, [2]u8 }) |T| {
-        var a: T = undefined;
-        res += a.len;
-    }
-    expect(res == 5);
-}
+//test "inline for with same type but different values" {
+//    var res: usize = 0;
+//    inline for ([_]type{ [2]u8, [1]u8, [2]u8 }) |T| {
+//        var a: T = undefined;
+//        res += a.len;
+//    }
+//    expect(res == 5);
+//}
 
 test "refer to the type of a generic function" {
     const Func = fn (type) void;
diff --git a/test/stage1/behavior/generics.zig b/test/stage1/behavior/generics.zig
index 664b982c2..c514735d1 100644
--- a/test/stage1/behavior/generics.zig
+++ b/test/stage1/behavior/generics.zig
@@ -80,19 +80,19 @@ test "function with return type type" {
     expect(list2.prealloc_items.len == 8);
 }
 
-test "generic struct" {
-    var a1 = GenNode(i32){
-        .value = 13,
-        .next = null,
-    };
-    var b1 = GenNode(bool){
-        .value = true,
-        .next = null,
-    };
-    expect(a1.value == 13);
-    expect(a1.value == a1.getVal());
-    expect(b1.getVal());
-}
+//test "generic struct" {
+//    var a1 = GenNode(i32){
+//        .value = 13,
+//        .next = null,
+//    };
+//    var b1 = GenNode(bool){
+//        .value = true,
+//        .next = null,
+//    };
+//    expect(a1.value == 13);
+//    expect(a1.value == a1.getVal());
+//    expect(b1.getVal());
+//}
 fn GenNode(comptime T: type) type {
     return struct {
         value: T,
diff --git a/test/stage1/behavior/misc.zig b/test/stage1/behavior/misc.zig
index 28df26f9f..fbc4e721e 100644
--- a/test/stage1/behavior/misc.zig
+++ b/test/stage1/behavior/misc.zig
@@ -686,13 +686,13 @@ fn getNull() ?*i32 {
     return null;
 }
 
-test "thread local variable" {
-    const S = struct {
-        threadlocal var t: i32 = 1234;
-    };
-    S.t += 1;
-    expect(S.t == 1235);
-}
+//test "thread local variable" {
+//    const S = struct {
+//        threadlocal var t: i32 = 1234;
+//    };
+//    S.t += 1;
+//    expect(S.t == 1235);
+//}
 
 test "unicode escape in character literal" {
     var a: u24 = '\U01f4a9';
diff --git a/test/stage1/behavior/optional.zig b/test/stage1/behavior/optional.zig
index a65bed020..0539d1c20 100644
--- a/test/stage1/behavior/optional.zig
+++ b/test/stage1/behavior/optional.zig
@@ -2,11 +2,11 @@ const expect = @import("std").testing.expect;
 
 pub const EmptyStruct = struct {};
 
-test "optional pointer to size zero struct" {
-    var e = EmptyStruct{};
-    var o: ?*EmptyStruct = &e;
-    expect(o != null);
-}
+//test "optional pointer to size zero struct" {
+//    var e = EmptyStruct{};
+//    var o: ?*EmptyStruct = &e;
+//    expect(o != null);
+//}
 
 test "equality compare nullable pointers" {
     testNullPtrsEql();
diff --git a/test/stage1/behavior/ptrcast.zig b/test/stage1/behavior/ptrcast.zig
index bf9288821..004ae4dd8 100644
--- a/test/stage1/behavior/ptrcast.zig
+++ b/test/stage1/behavior/ptrcast.zig
@@ -59,10 +59,10 @@ test "comptime ptrcast keeps larger alignment" {
     }
 }
 
-test "implicit optional pointer to optional c_void pointer" {
-    var buf: [4]u8 = "aoeu";
-    var x: ?[*]u8 = &buf;
-    var y: ?*c_void = x;
-    var z = @ptrCast(*[4]u8, y);
-    expect(std.mem.eql(u8, z, "aoeu"));
-}
+//test "implicit optional pointer to optional c_void pointer" {
+//    var buf: [4]u8 = "aoeu";
+//    var x: ?[*]u8 = &buf;
+//    var y: ?*c_void = x;
+//    var z = @ptrCast(*[4]u8, y);
+//    expect(std.mem.eql(u8, z, "aoeu"));
+//}
diff --git a/test/stage1/behavior/while.zig b/test/stage1/behavior/while.zig
index 29ad90ed1..5e486a249 100644
--- a/test/stage1/behavior/while.zig
+++ b/test/stage1/behavior/while.zig
@@ -82,28 +82,28 @@ test "while with else" {
     expect(got_else == 1);
 }
 
-test "while with optional as condition" {
-    numbers_left = 10;
-    var sum: i32 = 0;
-    while (getNumberOrNull()) |value| {
-        sum += value;
-    }
-    expect(sum == 45);
-}
-
-test "while with optional as condition with else" {
-    numbers_left = 10;
-    var sum: i32 = 0;
-    var got_else: i32 = 0;
-    while (getNumberOrNull()) |value| {
-        sum += value;
-        expect(got_else == 0);
-    } else {
-        got_else += 1;
-    }
-    expect(sum == 45);
-    expect(got_else == 1);
-}
+//test "while with optional as condition" {
+//    numbers_left = 10;
+//    var sum: i32 = 0;
+//    while (getNumberOrNull()) |value| {
+//        sum += value;
+//    }
+//    expect(sum == 45);
+//}
+//
+//test "while with optional as condition with else" {
+//    numbers_left = 10;
+//    var sum: i32 = 0;
+//    var got_else: i32 = 0;
+//    while (getNumberOrNull()) |value| {
+//        sum += value;
+//        expect(got_else == 0);
+//    } else {
+//        got_else += 1;
+//    }
+//    expect(sum == 45);
+//    expect(got_else == 1);
+//}
 
 test "while with error union condition" {
     numbers_left = 10;