tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Don't run GWP ASan integration tests under HWASan." am: 90dd5f0fd1

Browse source 
Original change: https://android-review.googlesource.com/c/platform/bionic/+/2466946

Change-Id: If51907014308e9948a8d2e2a50ce8fd313459184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Christopher Ferris 2023-03-03 01:57:52 +00:00 committed by Automerger Merge Worker
commit 595e54fc2b
1 changed files with 28 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
tests/gwp_asan_test.cpp
View file

@ -58,13 +58,10 @@ extern "C" bool GetInitialArgs(const char*** args, size_t* num_args) {
// the torture mode is is generally 40,000, so that svelte devices don't
// explode, as this uses ~163MiB RAM (4KiB per live allocation).
TEST(gwp_asan_integration, malloc_tests_under_torture) {
if (running_with_hwasan()) {
// Skip the malloc.zeroed tests since they fail in this particular config.
// TODO(b/267386540): Need to fix this problem.
RunGwpAsanTest("malloc.*:-malloc.mallinfo*:malloc.zeroed*");
} else {
RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
}
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
RunGwpAsanTest("malloc.*:-malloc.mallinfo*");
}
class SyspropRestorer {
@ -153,6 +150,9 @@ TEST(gwp_asan_integration, DISABLED_assert_gwp_asan_disabled) {
}
TEST(gwp_asan_integration, sysprops_program_specific) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
std::string path = testing::internal::GetArgvs()[0];
@ -167,6 +167,9 @@ TEST(gwp_asan_integration, sysprops_program_specific) {
}
TEST(gwp_asan_integration, sysprops_persist_program_specific) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
std::string path = testing::internal::GetArgvs()[0];
@ -182,6 +185,9 @@ TEST(gwp_asan_integration, sysprops_persist_program_specific) {
}
TEST(gwp_asan_integration, sysprops_system) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
__system_property_set("libc.debug.gwp_asan.sample_rate.system_default", "1");
@ -192,6 +198,9 @@ TEST(gwp_asan_integration, sysprops_system) {
}
TEST(gwp_asan_integration, sysprops_persist_system) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
__system_property_set("persist.libc.debug.gwp_asan.sample_rate.system_default", "1");
@ -202,6 +211,9 @@ TEST(gwp_asan_integration, sysprops_persist_system) {
}
TEST(gwp_asan_integration, sysprops_non_persist_overrides_persist) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
__system_property_set("libc.debug.gwp_asan.sample_rate.system_default", "1");
@ -216,6 +228,9 @@ TEST(gwp_asan_integration, sysprops_non_persist_overrides_persist) {
}
TEST(gwp_asan_integration, sysprops_program_specific_overrides_default) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
std::string path = testing::internal::GetArgvs()[0];
@ -235,6 +250,9 @@ TEST(gwp_asan_integration, sysprops_program_specific_overrides_default) {
}
TEST(gwp_asan_integration, sysprops_can_disable) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
__system_property_set("libc.debug.gwp_asan.sample_rate.system_default", "0");
@ -245,6 +263,9 @@ TEST(gwp_asan_integration, sysprops_can_disable) {
}
TEST(gwp_asan_integration, env_overrides_sysprop) {
// Do not override HWASan with GWP ASan.
SKIP_WITH_HWASAN;
SyspropRestorer restorer;
__system_property_set("libc.debug.gwp_asan.sample_rate.system_default", "0");