diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-02-05 14:43:11 -0800 |
|---|---|---|
| committer | Kevin Krakauer <krakauer@google.com> | 2020-02-05 14:43:11 -0800 |
| commit | bf0ea204e9415a181c63ee10078cca753df14f7e (patch) | |
| tree | f4d149ac2bf2ea900f8b2a0cdea0a7a2ea7e6d0e /test/syscalls/linux/fork.cc | |
| parent | 29ad5762e4549d961f48c65292cfdeb7256524f6 (diff) | |
| parent | f2d3efca1deded31a2929ea77c0eecf476764660 (diff) | |
Merge branch 'master' into tcp-matchers-submit
Diffstat (limited to 'test/syscalls/linux/fork.cc')
| -rw-r--r-- | test/syscalls/linux/fork.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test/syscalls/linux/fork.cc b/test/syscalls/linux/fork.cc index 371890110..906f3358d 100644 --- a/test/syscalls/linux/fork.cc +++ b/test/syscalls/linux/fork.cc @@ -215,6 +215,8 @@ TEST_F(ForkTest, PrivateMapping) { EXPECT_THAT(Wait(child), SyscallSucceedsWithValue(0)); } +// CPUID is x86 specific. +#ifdef __x86_64__ // Test that cpuid works after a fork. TEST_F(ForkTest, Cpuid) { pid_t child = Fork(); @@ -227,6 +229,7 @@ TEST_F(ForkTest, Cpuid) { } EXPECT_THAT(Wait(child), SyscallSucceedsWithValue(0)); } +#endif TEST_F(ForkTest, Mmap) { pid_t child = Fork(); |