Merge "[mips] Add missing linker shdr tests"

am: fc9958ce76 Change-Id: I621c6e98dac498e12552281b87374a7ba4578e71
2016-08-17 19:00:02 +00:00 · 2016-08-17 19:00:02 +00:00 · 2223d5bb1c
commit 2223d5bb1c
parent 4321522b66 fc9958ce76
16 changed files with 3 additions and 3 deletions
--- a/tests/Android.build.prebuilt.mk
+++ b/tests/Android.build.prebuilt.mk
@ -21,10 +21,10 @@ LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TE
 LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/prebuilt-elf-files
 LOCAL_MODULE_CLASS := EXECUTABLES

-LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64
-
 LOCAL_SRC_FILES_arm := prebuilt-elf-files/arm/$(bionic_tests_module)
 LOCAL_SRC_FILES_arm64 := prebuilt-elf-files/arm64/$(bionic_tests_module)
 LOCAL_SRC_FILES_x86 := prebuilt-elf-files/x86/$(bionic_tests_module)
 LOCAL_SRC_FILES_x86_64 := prebuilt-elf-files/x86_64/$(bionic_tests_module)
+LOCAL_SRC_FILES_mips := prebuilt-elf-files/mips/$(bionic_tests_module)
+LOCAL_SRC_FILES_mips64 := prebuilt-elf-files/mips64/$(bionic_tests_module)
 include $(BUILD_PREBUILT)
--- a/tests/dlfcn_test.cpp
+++ b/tests/dlfcn_test.cpp
@ -1144,7 +1144,7 @@ TEST(dlfcn, dt_runpath_absolute_path) {
 }

 // Bionic specific tests
-#if defined(__BIONIC__) && !defined(__mips__)
+#if defined(__BIONIC__)

 #if defined(__LP64__)
 #define NATIVE_TESTS_PATH "/nativetest64"
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-empty_shdr_table.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-empty_shdr_table.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-rw_load_segment.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-rw_load_segment.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-unaligned_shdr_offset.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-unaligned_shdr_offset.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shdr_table_content.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shdr_table_content.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shdr_table_offset.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shdr_table_offset.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shentsize.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shentsize.so
--- a/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shstrndx.so
+++ b/tests/prebuilt-elf-files/mips/libtest_invalid-zero_shstrndx.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-empty_shdr_table.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-empty_shdr_table.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-rw_load_segment.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-rw_load_segment.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-unaligned_shdr_offset.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-unaligned_shdr_offset.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shdr_table_content.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shdr_table_content.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shdr_table_offset.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shdr_table_offset.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shentsize.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shentsize.so
--- a/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shstrndx.so
+++ b/tests/prebuilt-elf-files/mips64/libtest_invalid-zero_shstrndx.so