authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-22 13:36:26-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-04-22 13:36:26-04:00
logda2af9c613841552e9e47b6c9f0e9e4ee74894fb
treedf31e159e25b97021c9446a21704f79e075e1f2d
parent0dcadc61b4ce8fb3ffb75b8f266bff2c6ae149b6

fixups

4 files changed, 9 insertions(+), 14 deletions(-)

std/os/index.zig+1-2
...@@ -4,8 +4,7 @@ const Os = builtin.Os;...@@ -4,8 +4,7 @@ const Os = builtin.Os;
4const is_windows = builtin.os == Os.windows;4const is_windows = builtin.os == Os.windows;
5const os = this;5const os = this;
66
7comptime {7test "std.os" {
8 if (!builtin.is_test) return;
9 _ = @import("child_process.zig");8 _ = @import("child_process.zig");
10 _ = @import("darwin.zig");9 _ = @import("darwin.zig");
11 _ = @import("darwin_errno.zig");10 _ = @import("darwin_errno.zig");
std/os/linux/index.zig+4-3
...@@ -1309,7 +1309,8 @@ pub fn capset(hdrp: &cap_user_header_t, datap: &const cap_user_data_t) usize {...@@ -1309,7 +1309,8 @@ pub fn capset(hdrp: &cap_user_header_t, datap: &const cap_user_data_t) usize {
1309 return syscall2(SYS_capset, @ptrToInt(hdrp), @ptrToInt(datap));1309 return syscall2(SYS_capset, @ptrToInt(hdrp), @ptrToInt(datap));
1310}1310}
13111311
1312comptime {1312test "import" {
1313 if (!builtin.is_test) return;1313 if (builtin.os == builtin.Os.linux) {
1314 _ = @import("test.zig");1314 _ = @import("test.zig");
1315 }
1315}1316}
std/os/linux/test.zig-2
...@@ -4,8 +4,6 @@ const linux = std.os.linux;...@@ -4,8 +4,6 @@ const linux = std.os.linux;
4const assert = std.debug.assert;4const assert = std.debug.assert;
55
6test "timer" {6test "timer" {
7 if (builtin.os != builtin.Os.linux) return;
8
9 const epoll_fd = linux.epoll_create();7 const epoll_fd = linux.epoll_create();
10 var err = linux.getErrno(epoll_fd);8 var err = linux.getErrno(epoll_fd);
11 assert(err == 0);9 assert(err == 0);
std/os/windows/index.zig+4-7
...@@ -1,10 +1,3 @@...@@ -1,10 +1,3 @@
1const builtin = @import("builtin");
2comptime {
3 if (!builtin.is_test) return;
4 _ = @import("util.zig");
5}
6
7
8pub const ERROR = @import("error.zig");1pub const ERROR = @import("error.zig");
92
10pub extern "advapi32" stdcallcc fn CryptAcquireContextA(phProv: &HCRYPTPROV, pszContainer: ?LPCSTR,3pub extern "advapi32" stdcallcc fn CryptAcquireContextA(phProv: &HCRYPTPROV, pszContainer: ?LPCSTR,
...@@ -324,3 +317,7 @@ pub const FILE_END = 2;...@@ -324,3 +317,7 @@ pub const FILE_END = 2;
324pub const HEAP_CREATE_ENABLE_EXECUTE = 0x00040000;317pub const HEAP_CREATE_ENABLE_EXECUTE = 0x00040000;
325pub const HEAP_GENERATE_EXCEPTIONS = 0x00000004;318pub const HEAP_GENERATE_EXCEPTIONS = 0x00000004;
326pub const HEAP_NO_SERIALIZE = 0x00000001;319pub const HEAP_NO_SERIALIZE = 0x00000001;
320
321test "import" {
322 _ = @import("util.zig");
323}