Merge "Skip debuggerd tests that do not apply to HWASan." am: 4691a163c1
am: c698df72a0
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2065788 Change-Id: I6649ae02cf627079791eb18f28ee03e1ea7e18aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
249db31bdb
|
@ -377,6 +377,8 @@ TEST_F(CrasherTest, tagged_fault_addr) {
|
||||||
#if !defined(__aarch64__)
|
#if !defined(__aarch64__)
|
||||||
GTEST_SKIP() << "Requires aarch64";
|
GTEST_SKIP() << "Requires aarch64";
|
||||||
#endif
|
#endif
|
||||||
|
// HWASan crashes with SIGABRT on tag mismatch.
|
||||||
|
SKIP_WITH_HWASAN;
|
||||||
int intercept_result;
|
int intercept_result;
|
||||||
unique_fd output_fd;
|
unique_fd output_fd;
|
||||||
StartProcess([]() {
|
StartProcess([]() {
|
||||||
|
@ -408,6 +410,10 @@ TEST_F(CrasherTest, heap_addr_in_register) {
|
||||||
#if defined(__i386__)
|
#if defined(__i386__)
|
||||||
GTEST_SKIP() << "architecture does not pass arguments in registers";
|
GTEST_SKIP() << "architecture does not pass arguments in registers";
|
||||||
#endif
|
#endif
|
||||||
|
// The memory dump in HWASan crashes sadly shows the memory near the registers
|
||||||
|
// in the HWASan dump function, rather the faulting context. This is a known
|
||||||
|
// issue.
|
||||||
|
SKIP_WITH_HWASAN;
|
||||||
int intercept_result;
|
int intercept_result;
|
||||||
unique_fd output_fd;
|
unique_fd output_fd;
|
||||||
StartProcess([]() {
|
StartProcess([]() {
|
||||||
|
@ -486,6 +492,8 @@ TEST_P(GwpAsanCrasherTest, gwp_asan_uaf) {
|
||||||
// instead of GWP-ASan.
|
// instead of GWP-ASan.
|
||||||
GTEST_SKIP() << "Skipped on MTE.";
|
GTEST_SKIP() << "Skipped on MTE.";
|
||||||
}
|
}
|
||||||
|
// Skip this test on HWASan, which will reliably catch test errors as well.
|
||||||
|
SKIP_WITH_HWASAN;
|
||||||
|
|
||||||
GwpAsanTestParameters params = GetParam();
|
GwpAsanTestParameters params = GetParam();
|
||||||
LogcatCollector logcat_collector;
|
LogcatCollector logcat_collector;
|
||||||
|
@ -2021,6 +2029,9 @@ TEST_F(CrasherTest, fault_address_before_first_map) {
|
||||||
|
|
||||||
// Verify that a fault address after the last map is properly handled.
|
// Verify that a fault address after the last map is properly handled.
|
||||||
TEST_F(CrasherTest, fault_address_after_last_map) {
|
TEST_F(CrasherTest, fault_address_after_last_map) {
|
||||||
|
// This makes assumptions about the memory layout that are not true in HWASan
|
||||||
|
// processes.
|
||||||
|
SKIP_WITH_HWASAN;
|
||||||
uintptr_t crash_uptr = untag_address(UINTPTR_MAX - 15);
|
uintptr_t crash_uptr = untag_address(UINTPTR_MAX - 15);
|
||||||
StartProcess([crash_uptr]() {
|
StartProcess([crash_uptr]() {
|
||||||
ASSERT_EQ(0, crash_call(crash_uptr));
|
ASSERT_EQ(0, crash_call(crash_uptr));
|
||||||
|
|
Loading…
Reference in New Issue