Add tests for static ELF TLS
Bug: http://b/78026329
Test: bionic unit tests
Merged-In: I806f2bd193998dfe352372476104876edb27aebf
Change-Id: I806f2bd193998dfe352372476104876edb27aebf
diff --git a/tests/Android.bp b/tests/Android.bp
index beed07a..8ac0531 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -218,6 +218,44 @@
generated_headers: ["generated_android_ids"],
}
+cc_test_library {
+ name: "libBionicElfTlsTests",
+ defaults: ["bionic_tests_defaults"],
+ srcs: [
+ "elftls_test.cpp",
+ ],
+ include_dirs: [
+ "bionic/libc",
+ ],
+ shared: {
+ enabled: false,
+ },
+ cflags: [
+ "-fno-emulated-tls",
+ ],
+}
+
+cc_test_library {
+ name: "libBionicElfTlsLoaderTests",
+ defaults: ["bionic_tests_defaults"],
+ srcs: [
+ "elftls_dl_test.cpp",
+ ],
+ include_dirs: [
+ "bionic/libc",
+ ],
+ static_libs: [
+ "liblog",
+ "libbase",
+ ],
+ shared: {
+ enabled: false,
+ },
+ cflags: [
+ "-fno-emulated-tls",
+ ],
+}
+
// -----------------------------------------------------------------------------
// Fortify tests.
// -----------------------------------------------------------------------------
@@ -306,6 +344,7 @@
defaults: ["bionic_tests_defaults"],
whole_static_libs: [
"libBionicStandardTests",
+ "libBionicElfTlsTests",
"libfortify1-tests-clang",
"libfortify2-tests-clang",
],
@@ -389,6 +428,7 @@
whole_static_libs: [
"libBionicTests",
"libBionicLoaderTests",
+ "libBionicElfTlsLoaderTests",
],
static_libs: [
@@ -423,6 +463,8 @@
"libdl_preempt_test_1",
"libdl_preempt_test_2",
"libdl_test_df_1_global",
+ "libtest_elftls_shared_var",
+ "libtest_elftls_tprel",
],
static_libs: [
// The order of these libraries matters, do not shuffle them.
@@ -471,6 +513,7 @@
required: [
"cfi_test_helper",
"cfi_test_helper2",
+ "elftls_dlopen_ie_error_helper",
"exec_linker_helper",
"exec_linker_helper_lib",
"libtest_dt_runpath_a",
@@ -528,6 +571,9 @@
"libtest_dlsym_from_this",
"libtest_dlsym_weak_func",
"libtest_dt_runpath_d",
+ "libtest_elftls_shared_var",
+ "libtest_elftls_shared_var_ie",
+ "libtest_elftls_tprel",
"libtest_empty",
"libtest_ifunc_variable_impl",
"libtest_ifunc_variable",
@@ -629,6 +675,8 @@
"libbase",
"libdebuggerd_handler",
"libgtest_isolated",
+ "libtest_elftls_shared_var",
+ "libtest_elftls_tprel",
],
static_executable: true,
@@ -662,12 +710,15 @@
shared_libs: [
"libdl_preempt_test_1",
"libdl_preempt_test_2",
-
"libdl_test_df_1_global",
+ "libtest_elftls_shared_var",
+ "libtest_elftls_tprel",
],
whole_static_libs: [
"libBionicStandardTests",
+ "libBionicElfTlsTests",
+ "libBionicElfTlsLoaderTests",
"libfortify1-tests-clang",
"libfortify2-tests-clang",
],