Merge "Revert "Disable dlfcn#dlopen_system_libicuuc_ tests due to test failures on cuttlefish"" am: cacda52a0a

Change-Id: Ida8a33d89e6fd935770afa8d15348bd4e87814c3
This commit is contained in:
vichang 2020-05-20 16:21:52 +00:00 committed by Automerger Merge Worker
commit ae5d43caa9

View file

@ -244,7 +244,6 @@ TEST(dlfcn, dlopen_system_libicuuc_android_api_level_28) {
ASSERT_TRUE(dlopen(PATH_TO_SYSTEM_LIB "libicui18n.so", RTLD_NOW) != nullptr);
}
/* TODO: Re-enable test when the cuttlefish build is fixed. http://b/156315785
TEST(dlfcn, dlopen_system_libicuuc_android_api_level_29) {
android_set_application_target_sdk_version(29);
ASSERT_TRUE(dlopen(PATH_TO_SYSTEM_LIB "libicuuc.so", RTLD_NOW) == nullptr);
@ -255,7 +254,6 @@ TEST(dlfcn, dlopen_system_libicuuc_android_api_level_current) {
ASSERT_TRUE(dlopen(PATH_TO_SYSTEM_LIB "libicuuc.so", RTLD_NOW) == nullptr);
ASSERT_TRUE(dlopen(PATH_TO_SYSTEM_LIB "libicui18n.so", RTLD_NOW) == nullptr);
}
*/
TEST(dlfcn, dlopen_from_zip_absolute_path) {
const std::string lib_zip_path = "/libdlext_test_zip/libdlext_test_zip_zipaligned.zip";