diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-09-21 05:17:21 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-09-21 05:17:21 +0000 |
commit | 146fa6b458faec2c09e9e6a24605ebd96c24e66c (patch) | |
tree | f46f513138c798c05b497d231847563fa59aaaf3 | |
parent | 4994552198faf64cdce1f083df943b791a1d575b (diff) | |
parent | 5e3d44100be32fd5efffd0c309bd90c04cc9620c (diff) | |
download | bionic-146fa6b458faec2c09e9e6a24605ebd96c24e66c.tar.gz |
Merge "Don't run exec_with_ld_config_file* tests on non-production devices" into oc-mr1-dev
-rw-r--r-- | tests/Android.bp | 12 | ||||
-rw-r--r-- | tests/dl_test.cpp | 23 |
2 files changed, 18 insertions, 17 deletions
diff --git a/tests/Android.bp b/tests/Android.bp index e8fa5bdf9..29204b558 100644 --- a/tests/Android.bp +++ b/tests/Android.bp @@ -299,12 +299,6 @@ cc_test_library { ], } }, - - product_variables: { - debuggable: { - cppflags: ["-DUSE_LD_CONFIG_FILE"], - }, - }, } // ----------------------------------------------------------------------------- @@ -605,12 +599,6 @@ cc_test_host { sanitize: { never: false, }, - - product_variables: { - debuggable: { - cppflags: ["-DUSE_LD_CONFIG_FILE"], - }, - }, } subdirs = ["libs"] diff --git a/tests/dl_test.cpp b/tests/dl_test.cpp index aaf2c3742..d09330dbc 100644 --- a/tests/dl_test.cpp +++ b/tests/dl_test.cpp @@ -180,12 +180,24 @@ static void create_ld_config_file(std::string& config_file) { } #endif -#ifdef USE_LD_CONFIG_FILE +#if defined(__BIONIC__) +static bool is_user_build() { + std::string build_type = android::base::GetProperty("ro.build.type", "user"); + if (build_type == "userdebug" || build_type == "eng") { + return false; + } + return true; +} +#endif // _lib1.so and _lib2.so are now searchable by having another namespace 'ns2' // whose search paths include the 'ns2/' subdir. TEST(dl, exec_with_ld_config_file) { #if defined(__BIONIC__) + if (is_user_build()) { + // LD_CONFIG_FILE is not supported on user build + return; + } std::string helper = get_testlib_root() + "/ld_config_test_helper/ld_config_test_helper"; std::string config_file = get_testlib_root() + "/ld.config.txt"; @@ -204,6 +216,10 @@ TEST(dl, exec_with_ld_config_file) { // additional namespaces other than the default namespace. TEST(dl, exec_with_ld_config_file_with_ld_preload) { #if defined(__BIONIC__) + if (is_user_build()) { + // LD_CONFIG_FILE is not supported on user build + return; + } std::string helper = get_testlib_root() + "/ld_config_test_helper/ld_config_test_helper"; std::string config_file = get_testlib_root() + "/ld.config.txt"; @@ -218,8 +234,6 @@ TEST(dl, exec_with_ld_config_file_with_ld_preload) { #endif } -#endif // USE_LD_CONFIG_FILE - // ensures that LD_CONFIG_FILE env var does not work for production builds. // The test input is the same as exec_with_ld_config_file, but it must fail in // this case. @@ -230,8 +244,7 @@ TEST(dl, disable_ld_config_file) { // This test is only for CTS. return; } - std::string build_type = android::base::GetProperty("ro.build.type", "user"); - if (build_type == "userdebug" || build_type == "eng") { + if (!is_user_build()) { // Skip the test for non production devices return; } |