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/32bit.cc | |
| parent | 29ad5762e4549d961f48c65292cfdeb7256524f6 (diff) | |
| parent | f2d3efca1deded31a2929ea77c0eecf476764660 (diff) | |
Merge branch 'master' into tcp-matchers-submit
Diffstat (limited to 'test/syscalls/linux/32bit.cc')
| -rw-r--r-- | test/syscalls/linux/32bit.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/syscalls/linux/32bit.cc b/test/syscalls/linux/32bit.cc index 2751fb4e7..9883aef61 100644 --- a/test/syscalls/linux/32bit.cc +++ b/test/syscalls/linux/32bit.cc @@ -102,7 +102,8 @@ TEST(Syscall32Bit, Int80) { } TEST(Syscall32Bit, Sysenter) { - if (PlatformSupport32Bit() == PlatformSupport::Allowed && + if ((PlatformSupport32Bit() == PlatformSupport::Allowed || + PlatformSupport32Bit() == PlatformSupport::Ignored) && GetCPUVendor() == CPUVendor::kAMD) { // SYSENTER is an illegal instruction in compatibility mode on AMD. EXPECT_EXIT(ExitGroup32(kSysenter, kExitCode), @@ -133,7 +134,8 @@ TEST(Syscall32Bit, Sysenter) { } TEST(Syscall32Bit, Syscall) { - if (PlatformSupport32Bit() == PlatformSupport::Allowed && + if ((PlatformSupport32Bit() == PlatformSupport::Allowed || + PlatformSupport32Bit() == PlatformSupport::Ignored) && GetCPUVendor() == CPUVendor::kIntel) { // SYSCALL is an illegal instruction in compatibility mode on Intel. EXPECT_EXIT(ExitGroup32(kSyscall, kExitCode), |