Merge branch 'master' into zen_stdlib

1 files changed, 35 insertions, 12 deletions

diff --git a/std/os/test.zig b/std/os/test.zig
index 718d1ce2c8..9e795e8ad2 100644
--- a/std/os/test.zig
+++ b/std/os/test.zig
@@ -6,13 +6,10 @@ const io = std.io;
 const a = std.debug.global_allocator;
 
 const builtin = @import("builtin");
+const AtomicRmwOp = builtin.AtomicRmwOp;
+const AtomicOrder = builtin.AtomicOrder;
 
 test "makePath, put some files in it, deleteTree" {
-    if (builtin.os == builtin.Os.windows) {
-        // TODO implement os.Dir for windows
-        // https://github.com/zig-lang/zig/issues/709
-        return;
-    }
     try os.makePath(a, "os_test_tmp/b/c");
     try io.writeFile(a, "os_test_tmp/b/c/file.txt", "nonsense");
     try io.writeFile(a, "os_test_tmp/b/file2.txt", "blah");
@@ -25,18 +22,44 @@ test "makePath, put some files in it, deleteTree" {
 }
 
 test "access file" {
-    if (builtin.os == builtin.Os.windows) {
-        return;
-    }
-
     try os.makePath(a, "os_test_tmp");
-    if (os.File.access(a, "os_test_tmp/file.txt", os.default_file_mode)) |ok| {
-        unreachable;
+    if (os.File.access(a, "os_test_tmp/file.txt")) |ok| {
+        @panic("expected error");
     } else |err| {
         assert(err == error.NotFound);
     }
 
     try io.writeFile(a, "os_test_tmp/file.txt", "");
-    assert((try os.File.access(a, "os_test_tmp/file.txt", os.default_file_mode)) == true);
+    try os.File.access(a, "os_test_tmp/file.txt");
     try os.deleteTree(a, "os_test_tmp");
 }
+
+test "spawn threads" {
+    var shared_ctx: i32 = 1;
+
+    const thread1 = try std.os.spawnThread({}, start1);
+    const thread2 = try std.os.spawnThread(&shared_ctx, start2);
+    const thread3 = try std.os.spawnThread(&shared_ctx, start2);
+    const thread4 = try std.os.spawnThread(&shared_ctx, start2);
+
+    thread1.wait();
+    thread2.wait();
+    thread3.wait();
+    thread4.wait();
+
+    assert(shared_ctx == 4);
+}
+
+fn start1(ctx: void) u8 {
+    return 0;
+}
+
+fn start2(ctx: *i32) u8 {
+    _ = @atomicRmw(i32, ctx, AtomicRmwOp.Add, 1, AtomicOrder.SeqCst);
+    return 0;
+}
+
+test "cpu count" {
+    const cpu_count = try std.os.cpuCount(a);
+    assert(cpu_count >= 1);
+}