diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-06-08 23:39:29 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-06-08 23:39:29 +0000 |
commit | 381ed8f9d2d247a760d7348d928bef8ac534886c (patch) | |
tree | 44241d23900cceb9a27427cc43b54cfd7a505303 | |
parent | b887dc0b5c5ac8ffa993a1ac6899ae92b6dbe8cb (diff) | |
parent | 686a21937bb94883adca571b8bcce102a2de4ddc (diff) | |
download | bionic-381ed8f9d2d247a760d7348d928bef8ac534886c.tar.gz |
Merge "Use ro.build.type instead of ro.debuggable" into sc-dev
-rw-r--r-- | tests/dl_test.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp index 766f27a0b..47bf13374 100644 --- a/tests/dl_test.cpp +++ b/tests/dl_test.cpp @@ -264,8 +264,11 @@ static void create_ld_config_file(const char* config_file) { #endif #if defined(__BIONIC__) -static bool is_debuggable_build() { - return android::base::GetBoolProperty("ro.debuggable", false); +// This test can't rely on ro.debuggable, because it might have been forced on +// in a user build ("Force Debuggable"). In that configuration, ro.debuggable is +// true, but Bionic's LD_CONFIG_FILE testing support is still disabled. +static bool is_user_build() { + return android::base::GetProperty("ro.build.type", "user") == std::string("user"); } #endif @@ -282,7 +285,7 @@ static bool is_debuggable_build() { TEST(dl, exec_with_ld_config_file) { #if defined(__BIONIC__) SKIP_WITH_HWASAN << "libclang_rt.hwasan is not found with custom ld config"; - if (!is_debuggable_build()) { + if (is_user_build()) { GTEST_SKIP() << "LD_CONFIG_FILE is not supported on user build"; } std::string helper = GetTestlibRoot() + @@ -319,7 +322,7 @@ TEST(dl, exec_with_ld_config_file) { TEST(dl, exec_with_ld_config_file_with_ld_preload) { #if defined(__BIONIC__) SKIP_WITH_HWASAN << "libclang_rt.hwasan is not found with custom ld config"; - if (!is_debuggable_build()) { + if (is_user_build()) { GTEST_SKIP() << "LD_CONFIG_FILE is not supported on user build"; } std::string helper = GetTestlibRoot() + @@ -356,8 +359,8 @@ TEST(dl, disable_ld_config_file) { // This test is only for CTS. GTEST_SKIP() << "test is not supported with root uid"; } - if (is_debuggable_build()) { - GTEST_SKIP() << "test is not supported on debuggable build"; + if (!is_user_build()) { + GTEST_SKIP() << "test requires user build"; } std::string error_message = std::string("CANNOT LINK EXECUTABLE ") + |