diff options
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/build/check-armeabi-v7a-prebuilts/build.sh | 10 | ||||
-rwxr-xr-x | tests/build/issue64679-prctl/build.sh | 3 | ||||
-rw-r--r-- | tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk | 6 | ||||
-rw-r--r-- | tests/device/b8708181-Vector4/jni/Vector4.cpp | 13 | ||||
-rw-r--r-- | tests/device/test-libc++-shared-full/jni/Android.mk | 24 | ||||
-rw-r--r-- | tests/device/test-libc++-static-full/jni/Android.mk | 24 | ||||
-rwxr-xr-x | tests/run-tests.sh | 28 |
7 files changed, 71 insertions, 37 deletions
diff --git a/tests/build/check-armeabi-v7a-prebuilts/build.sh b/tests/build/check-armeabi-v7a-prebuilts/build.sh index ff86ee353..858f81987 100755 --- a/tests/build/check-armeabi-v7a-prebuilts/build.sh +++ b/tests/build/check-armeabi-v7a-prebuilts/build.sh @@ -223,7 +223,15 @@ ARM_TOOLCHAIN_PREFIX=$(get_default_toolchain_prefix_for_arch arm) case $(uname -s) in Darwin) - HOST_TAG=darwin-$(uname -m) + HOST_ARCH=`uname -m` + case "$HOST_ARCH" in + i?86) HOST_ARCH=x86 + if ! echo __LP64__ | (CCOPTS= gcc -E - 2>/dev/null) | grep -q __LP64__ ; then + HOST_ARCH=x86_64 + fi + ;; + esac + HOST_TAG=darwin-$HOST_ARCH ;; Linux) HOST_TAG=linux-$(uname -p) diff --git a/tests/build/issue64679-prctl/build.sh b/tests/build/issue64679-prctl/build.sh index b183eb1bb..58ba04493 100755 --- a/tests/build/issue64679-prctl/build.sh +++ b/tests/build/issue64679-prctl/build.sh @@ -26,9 +26,6 @@ INVALID_HEADERS_FOR_64BIT="time64.h sys/user.h" # ToDo: remove sys/user.h later # --std=c++-0x or higher, so skip it here. INTERNAL_HEADERS="$INTERNAL_HEADERS uchar.h" -# The following Khronos headers cannot be compiled standalone. Meh! -INTERNAL_HEADERS="$INTERNAL_HEADERS GLES2/gl2ext.h" - for API_LEVEL in $API_LEVELS; do for ARCH in $DEFAULT_ARCHS; do if [ ! -d $ANDROID_NDK_ROOT/platforms/android-$API_LEVEL/arch-$ARCH ]; then diff --git a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk index eaf4706cb..5e144ea7f 100644 --- a/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk +++ b/tests/build/issue79115-confusing-ld.gold-warning/jni/Android.mk @@ -5,4 +5,10 @@ LOCAL_MODULE := issue79115-confusing-ld.gold-warning LOCAL_SRC_FILES := issue79115-confusing-ld.gold-warning.c LOCAL_DISABLE_NO_EXECUTE := true LOCAL_LDFLAGS += -Wl,--fatal-warnings + +ifneq ($(filter clang%,$(NDK_TOOLCHAIN_VERSION)),) +# Disable integrated assembler because -Wa,--execstack isn't supported +LOCAL_CFLAGS += -fno-integrated-as +endif + include $(BUILD_EXECUTABLE) diff --git a/tests/device/b8708181-Vector4/jni/Vector4.cpp b/tests/device/b8708181-Vector4/jni/Vector4.cpp index 6083a34dc..fd10faa5b 100644 --- a/tests/device/b8708181-Vector4/jni/Vector4.cpp +++ b/tests/device/b8708181-Vector4/jni/Vector4.cpp @@ -1,5 +1,17 @@ #include <stdio.h> +#if defined(__clang__) && defined(__aarch64__) && (__clang_major__ > 3 || (__clang_major__ == 3 && __clang_minor__ <= 4)) +/* Disable test for clang3.4/aarch64 because it cause the following error: + ..../lib/clang/3.4/include/arm_neon.h:65:24: error: 'neon_vector_type' attribute is not + supported for this target + */ +int main() +{ + return 0; +} + +#else + #if defined(__arm__) || defined(__aarch64__) #include <arm_neon.h> #define SP "sp" @@ -73,3 +85,4 @@ int main() } #endif +#endif diff --git a/tests/device/test-libc++-shared-full/jni/Android.mk b/tests/device/test-libc++-shared-full/jni/Android.mk index 3496280c6..255f06160 100644 --- a/tests/device/test-libc++-shared-full/jni/Android.mk +++ b/tests/device/test-libc++-shared-full/jni/Android.mk @@ -910,7 +910,7 @@ $(call gen-test, containers/sequences/vector.bool/swap_noexcept) $(call gen-test, containers/sequences/vector.bool/swap) $(call gen-test, containers/sequences/vector.bool/types) $(call gen-test, containers/sequences/vector.bool/vector_bool) -$(call gen-test, containers/sequences/vector/asan) # newnew +$(call gen-test, containers/sequences/vector/asan) $(call gen-test, containers/sequences/vector/const_value_type) $(call gen-test, containers/sequences/vector/db_back) $(call gen-test, containers/sequences/vector/db_cback) @@ -945,7 +945,7 @@ $(call gen-test, containers/sequences/vector/vector.cons/construct_size_value) $(call gen-test, containers/sequences/vector/vector.cons/copy_alloc) $(call gen-test, containers/sequences/vector/vector.cons/copy) $(call gen-test, containers/sequences/vector/vector.cons/default_noexcept) -$(call gen-test, containers/sequences/vector/vector.cons/default.recursive) # new +$(call gen-test, containers/sequences/vector/vector.cons/default.recursive) $(call gen-test, containers/sequences/vector/vector.cons/dtor_noexcept) $(call gen-test, containers/sequences/vector/vector.cons/initializer_list_alloc) $(call gen-test, containers/sequences/vector/vector.cons/initializer_list) @@ -1462,8 +1462,8 @@ $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string) $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do) $(call gen-test, diagnostics/syserr/version) -$(call gen-test, extensions/hash/specializations) # new -$(call gen-test, extensions/nothing_to_do) # new +$(call gen-test, extensions/hash/specializations) +$(call gen-test, extensions/nothing_to_do) $(call gen-test, input.output/file.streams/c.files/cinttypes) $(call gen-test, input.output/file.streams/c.files/cstdio) $(call gen-test, input.output/file.streams/c.files/version_ccstdio) @@ -1913,7 +1913,7 @@ $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/r $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere) -$(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/make_reverse_iterator) # new +$(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/make_reverse_iterator) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test) @@ -3709,8 +3709,8 @@ $(call gen-test, thread/thread.condition/thread.condition.condvarany/default) $(call gen-test, thread/thread.condition/thread.condition.condvarany/destructor) $(call gen-test, thread/thread.condition/thread.condition.condvarany/notify_all) $(call gen-test, thread/thread.condition/thread.condition.condvarany/notify_one) -$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait.exception) # new -$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for.exception) # new +$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait.exception) +$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for.exception) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for_pred) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait) @@ -3864,7 +3864,7 @@ $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/inner_all $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/max_size) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction) -$(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers) # new +$(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment) @@ -4000,7 +4000,7 @@ $(call gen-test, utilities/memory/default.allocator/allocator.members/address) $(call gen-test, utilities/memory/default.allocator/allocator.members/allocate) $(call gen-test, utilities/memory/default.allocator/allocator.members/construct) $(call gen-test, utilities/memory/default.allocator/allocator.members/max_size) -$(call gen-test, utilities/memory/default.allocator/allocator_pointers) # new +$(call gen-test, utilities/memory/default.allocator/allocator_pointers) $(call gen-test, utilities/memory/default.allocator/allocator_types) $(call gen-test, utilities/memory/default.allocator/allocator_void) $(call gen-test, utilities/memory/pointer.traits/difference_type) @@ -4251,7 +4251,7 @@ $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_default_constructible) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_destructible) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_empty) -$(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_final) # new +$(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_final) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_literal_type) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_move_assignable) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_move_constructible) @@ -4463,9 +4463,9 @@ $(call gen-test, utilities/time/time.traits/time.traits.specializations/duration $(call gen-test, utilities/time/time.traits/time.traits.specializations/time_point) $(call gen-test, utilities/time/version) $(call gen-test, utilities/tuple/tuple.general/nothing_to_do) -$(call gen-test, utilities/tuple/tuple.general/tuple.smartptr) # new +$(call gen-test, utilities/tuple/tuple.general/tuple.smartptr) $(call gen-test, utilities/tuple/tuple.tuple/empty_member) -$(call gen-test, utilities/tuple/tuple.tuple/TupleFunction) # new +$(call gen-test, utilities/tuple/tuple.tuple/TupleFunction) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/const_pair) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/convert_copy) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/convert_move) diff --git a/tests/device/test-libc++-static-full/jni/Android.mk b/tests/device/test-libc++-static-full/jni/Android.mk index 9e512bdd0..4b6f98558 100644 --- a/tests/device/test-libc++-static-full/jni/Android.mk +++ b/tests/device/test-libc++-static-full/jni/Android.mk @@ -901,7 +901,7 @@ $(call gen-test, containers/sequences/vector.bool/swap_noexcept) $(call gen-test, containers/sequences/vector.bool/swap) $(call gen-test, containers/sequences/vector.bool/types) $(call gen-test, containers/sequences/vector.bool/vector_bool) -$(call gen-test, containers/sequences/vector/asan) # newnew +$(call gen-test, containers/sequences/vector/asan) $(call gen-test, containers/sequences/vector/const_value_type) $(call gen-test, containers/sequences/vector/db_back) $(call gen-test, containers/sequences/vector/db_cback) @@ -936,7 +936,7 @@ $(call gen-test, containers/sequences/vector/vector.cons/construct_size_value) $(call gen-test, containers/sequences/vector/vector.cons/copy_alloc) $(call gen-test, containers/sequences/vector/vector.cons/copy) $(call gen-test, containers/sequences/vector/vector.cons/default_noexcept) -$(call gen-test, containers/sequences/vector/vector.cons/default.recursive) # new +$(call gen-test, containers/sequences/vector/vector.cons/default.recursive) $(call gen-test, containers/sequences/vector/vector.cons/dtor_noexcept) $(call gen-test, containers/sequences/vector/vector.cons/initializer_list_alloc) $(call gen-test, containers/sequences/vector/vector.cons/initializer_list) @@ -1453,8 +1453,8 @@ $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.members/ctor_int_error_category_string) $(call gen-test, diagnostics/syserr/syserr.syserr/syserr.syserr.overview/nothing_to_do) $(call gen-test, diagnostics/syserr/version) -$(call gen-test, extensions/hash/specializations) # new -$(call gen-test, extensions/nothing_to_do) # new +$(call gen-test, extensions/hash/specializations) +$(call gen-test, extensions/nothing_to_do) $(call gen-test, input.output/file.streams/c.files/cinttypes) $(call gen-test, input.output/file.streams/c.files/cstdio) $(call gen-test, input.output/file.streams/c.files/version_ccstdio) @@ -1904,7 +1904,7 @@ $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/r $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.conv/tested_elsewhere) -$(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/make_reverse_iterator) # new +$(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.make/make_reverse_iterator) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op-/difference_type) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op+/difference_type) $(call gen-test, iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.opdiff/test) @@ -3700,8 +3700,8 @@ $(call gen-test, thread/thread.condition/thread.condition.condvarany/default) $(call gen-test, thread/thread.condition/thread.condition.condvarany/destructor) $(call gen-test, thread/thread.condition/thread.condition.condvarany/notify_all) $(call gen-test, thread/thread.condition/thread.condition.condvarany/notify_one) -$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait.exception) # new -$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for.exception) # new +$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait.exception) +$(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for.exception) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait_for_pred) $(call gen-test, thread/thread.condition/thread.condition.condvarany/wait) @@ -3855,7 +3855,7 @@ $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/inner_all $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/max_size) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/outer_allocator) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.members/select_on_container_copy_construction) -$(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers) # new +$(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/allocator_pointers) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/inner_allocator_type) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_copy_assignment) $(call gen-test, utilities/allocator.adaptor/allocator.adaptor.types/propagate_on_container_move_assignment) @@ -3991,7 +3991,7 @@ $(call gen-test, utilities/memory/default.allocator/allocator.members/address) $(call gen-test, utilities/memory/default.allocator/allocator.members/allocate) $(call gen-test, utilities/memory/default.allocator/allocator.members/construct) $(call gen-test, utilities/memory/default.allocator/allocator.members/max_size) -$(call gen-test, utilities/memory/default.allocator/allocator_pointers) # new +$(call gen-test, utilities/memory/default.allocator/allocator_pointers) $(call gen-test, utilities/memory/default.allocator/allocator_types) $(call gen-test, utilities/memory/default.allocator/allocator_void) $(call gen-test, utilities/memory/pointer.traits/difference_type) @@ -4242,7 +4242,7 @@ $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_default_constructible) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_destructible) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_empty) -$(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_final) # new +$(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_final) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_literal_type) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_move_assignable) $(call gen-test, utilities/meta/meta.unary/meta.unary.prop/is_move_constructible) @@ -4454,9 +4454,9 @@ $(call gen-test, utilities/time/time.traits/time.traits.specializations/duration $(call gen-test, utilities/time/time.traits/time.traits.specializations/time_point) $(call gen-test, utilities/time/version) $(call gen-test, utilities/tuple/tuple.general/nothing_to_do) -$(call gen-test, utilities/tuple/tuple.general/tuple.smartptr) # new +$(call gen-test, utilities/tuple/tuple.general/tuple.smartptr) $(call gen-test, utilities/tuple/tuple.tuple/empty_member) -$(call gen-test, utilities/tuple/tuple.tuple/TupleFunction) # new +$(call gen-test, utilities/tuple/tuple.tuple/TupleFunction) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/const_pair) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/convert_copy) $(call gen-test, utilities/tuple/tuple.tuple/tuple.assign/convert_move) diff --git a/tests/run-tests.sh b/tests/run-tests.sh index 7cbbc605c..65fc43617 100755 --- a/tests/run-tests.sh +++ b/tests/run-tests.sh @@ -570,11 +570,19 @@ is_incompatible_abi () local APP_ABIS=`get_build_var $PROJECT APP_ABI` APP_ABIS=$APP_ABIS" " if [ "$APP_ABIS" != "${APP_ABIS%%all*}" ] ; then - # replace the first "all" with all available ABIs - ALL_ABIS=`get_build_var $PROJECT NDK_ALL_ABIS` - APP_ABIS_FRONT="${APP_ABIS%%all*}" - APP_ABIS_BACK="${APP_ABIS#*all}" - APP_ABIS="${APP_ABIS_FRONT}${ALL_ABIS}${APP_ABIS_BACK}" + # replace "all", "all32" and "all64" + _EXPANDED=`get_build_var $PROJECT NDK_APP_ABI_ALL_EXPANDED` + _FRONT="${APP_ABIS%%all*}" + _BACK="${APP_ABIS#*all}" + APP_ABIS="${_FRONT}${_EXPANDED}${_BACK}" + _EXPANDED=`get_build_var $PROJECT NDK_APP_ABI_ALL32_EXPANDED` + _FRONT="${APP_ABIS%%all32*}" + _BACK="${APP_ABIS#*all32}" + APP_ABIS="${_FRONT}${_EXPANDED}${_BACK}" + _EXPANDED=`get_build_var $PROJECT NDK_APP_ABI_ALL64_EXPANDED` + _FRONT="${APP_ABIS%%all64*}" + _BACK="${APP_ABIS#*all64}" + APP_ABIS="${_FRONT}${_EXPANDED}${_BACK}" fi if [ "$APP_ABIS" = "${APP_ABIS%$ABI *}" ] ; then echo "Skipping `basename $PROJECT`: incompatible ABI, needs $APP_ABIS" @@ -911,9 +919,11 @@ if is_testable device; then dump " ---> TEST FAILED!!" fi adb_var_shell_cmd "$DEVICE" "" "rm -f $DSTPATH" - for DATA in $(ls $DATAPATHS); do - adb_var_shell_cmd "$DEVICE" "" "rm -f $DSTDIR/`basename $DATA`" - done + if [ -n "$DATAPATHS" ]; then + for DATA in $(ls $DATAPATHS); do + adb_var_shell_cmd "$DEVICE" "" "rm -f $DSTDIR/`basename $DATA`" + done + fi done # Cleanup adb_var_shell_cmd "$DEVICE" "" rm -r $DSTDIR @@ -971,7 +981,7 @@ if is_testable device; then adb_var_shell_cmd "$DEVICE" CPU_ABI2 getprop ro.product.cpu.abi2 CPU_ABIS="$CPU_ABI1,$CPU_ABI2" CPU_ABIS=$(commas_to_spaces $CPU_ABIS) - if [ "$_NDK_TESTING_ALL_" = "yes" ]; then + if [ -n "$_NDK_TESTING_ALL_" ]; then if [ "$CPU_ABI1" = "armeabi-v7a" -o "$CPU_ABI2" = "armeabi-v7a" ]; then CPU_ABIS="$CPU_ABIS armeabi-v7a-hard" fi |