summaryrefslogtreecommitdiffhomepage
path: root/test/syscalls/linux/proc.cc
diff options
context:
space:
mode:
authorTamir Duberstein <tamird@google.com>2019-04-26 12:46:14 -0700
committerShentubot <shentubot@google.com>2019-04-26 12:47:46 -0700
commit59442238d4d9e48433cd0601ffa53e280fb872bc (patch)
tree0857202d3ffeb4255d872507c4e6baf9329e4a1e /test/syscalls/linux/proc.cc
parent5f13338d30fb59241cf7f1aa6374c54c69677314 (diff)
Remove syscall tests' dependency on glog
PiperOrigin-RevId: 245469859 Change-Id: I0610e477cc3a884275852e83028ecfb501f2c039
Diffstat (limited to 'test/syscalls/linux/proc.cc')
-rw-r--r--test/syscalls/linux/proc.cc10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/syscalls/linux/proc.cc b/test/syscalls/linux/proc.cc
index 67d3d18c7..a55ecaef1 100644
--- a/test/syscalls/linux/proc.cc
+++ b/test/syscalls/linux/proc.cc
@@ -133,7 +133,6 @@ PosixError WithSubprocess(SubprocessCallback const& running,
while (true) {
SleepSafe(absl::Milliseconds(100));
}
- __builtin_unreachable();
}
close(pipe_fds[1]); // Close the write end.
@@ -565,12 +564,9 @@ TEST(ProcSelfMaps, MapUnmap) {
}
TEST(ProcSelfMaps, Mprotect) {
- if (!IsRunningOnGvisor()) {
- // FIXME: Linux's mprotect() sometimes fails to merge VMAs in this
- // case.
- LOG(WARNING) << "Skipping test on Linux";
- return;
- }
+ // FIXME: Linux's mprotect() sometimes fails to merge VMAs in this
+ // case.
+ SKIP_IF(!IsRunningOnGvisor());
// Reserve 5 pages of address space.
Mapping m = ASSERT_NO_ERRNO_AND_VALUE(