diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-03-03 13:48:00 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-03-03 13:48:00 -0800 |
| commit | ba8b8154e85c0230ebe25149fa6cf9d24a03441d (patch) | |
| tree | 6cb0511cc4e462787edf4ef4f6b3710b6272f8b3 | |
| parent | 3aa97c893dbbf3945c8812ebf158306921343dc8 (diff) | |
| parent | dd1ed5c789ff72fd6bbacda0ff7c7acf9672d25a (diff) | |
Merge pull request #2008 from lubinszARM:pr_skip_vsyscall
PiperOrigin-RevId: 298683693
| -rw-r--r-- | test/syscalls/linux/time.cc | 2 | ||||
| -rw-r--r-- | test/syscalls/linux/vsyscall.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/test/syscalls/linux/time.cc b/test/syscalls/linux/time.cc index 1ccb95733..e75bba669 100644 --- a/test/syscalls/linux/time.cc +++ b/test/syscalls/linux/time.cc @@ -26,6 +26,7 @@ namespace { constexpr long kFudgeSeconds = 5; +#if defined(__x86_64__) || defined(__i386__) // Mimics the time(2) wrapper from glibc prior to 2.15. time_t vsyscall_time(time_t* t) { constexpr uint64_t kVsyscallTimeEntry = 0xffffffffff600400; @@ -98,6 +99,7 @@ TEST(TimeTest, VsyscallGettimeofday_InvalidAddressSIGSEGV) { reinterpret_cast<struct timezone*>(0x1)), ::testing::KilledBySignal(SIGSEGV), ""); } +#endif } // namespace diff --git a/test/syscalls/linux/vsyscall.cc b/test/syscalls/linux/vsyscall.cc index 2c2303358..ae4377108 100644 --- a/test/syscalls/linux/vsyscall.cc +++ b/test/syscalls/linux/vsyscall.cc @@ -24,6 +24,7 @@ namespace testing { namespace { +#if defined(__x86_64__) || defined(__i386__) time_t vsyscall_time(time_t* t) { constexpr uint64_t kVsyscallTimeEntry = 0xffffffffff600400; return reinterpret_cast<time_t (*)(time_t*)>(kVsyscallTimeEntry)(t); @@ -37,6 +38,7 @@ TEST(VsyscallTest, VsyscallAlwaysAvailableOnGvisor) { time_t t; EXPECT_THAT(vsyscall_time(&t), SyscallSucceeds()); } +#endif } // namespace |