Merge remote-tracking branch 'origin/master' into llvm8

1 files changed, 6 insertions, 6 deletions

diff --git a/std/os/linux/test.zig b/std/os/linux/test.zig
index 4de26012c7..40fb7823d2 100644
--- a/std/os/linux/test.zig
+++ b/std/os/linux/test.zig
@@ -1,19 +1,19 @@
 const std = @import("../../index.zig");
 const builtin = @import("builtin");
 const linux = std.os.linux;
-const assert = std.debug.assert;
+const expect = std.testing.expect;
 
 test "getpid" {
-    assert(linux.getpid() != 0);
+    expect(linux.getpid() != 0);
 }
 
 test "timer" {
     const epoll_fd = linux.epoll_create();
     var err = linux.getErrno(epoll_fd);
-    assert(err == 0);
+    expect(err == 0);
 
     const timer_fd = linux.timerfd_create(linux.CLOCK_MONOTONIC, 0);
-    assert(linux.getErrno(timer_fd) == 0);
+    expect(linux.getErrno(timer_fd) == 0);
 
     const time_interval = linux.timespec{
         .tv_sec = 0,
@@ -26,7 +26,7 @@ test "timer" {
     };
 
     err = linux.timerfd_settime(@intCast(i32, timer_fd), 0, &new_time, null);
-    assert(err == 0);
+    expect(err == 0);
 
     var event = linux.epoll_event{
         .events = linux.EPOLLIN | linux.EPOLLOUT | linux.EPOLLET,
@@ -34,7 +34,7 @@ test "timer" {
     };
 
     err = linux.epoll_ctl(@intCast(i32, epoll_fd), linux.EPOLL_CTL_ADD, @intCast(i32, timer_fd), &event);
-    assert(err == 0);
+    expect(err == 0);
 
     const events_one: linux.epoll_event = undefined;
     var events = []linux.epoll_event{events_one} ** 8;