diff options
| -rw-r--r-- | build/core/add-application.mk | 10 | ||||
| -rwxr-xr-x | build/tools/build-gcc.sh | 3 | ||||
| -rwxr-xr-x | build/tools/build-gnu-libstdc++.sh | 9 | ||||
| -rwxr-xr-x | build/tools/build-llvm.sh | 9 | ||||
| -rwxr-xr-x | build/tools/make-standalone-toolchain.sh | 4 | ||||
| -rwxr-xr-x | build/tools/package-release.sh | 15 | ||||
| -rwxr-xr-x | build/tools/patch-sources.sh | 10 | ||||
| -rw-r--r-- | build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch | 2 | ||||
| -rw-r--r-- | sources/android/cpufeatures/cpu-features.c | 7 | ||||
| -rw-r--r-- | sources/android/support/Android.mk | 3 | ||||
| -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 |
17 files changed, 113 insertions, 67 deletions
diff --git a/build/core/add-application.mk b/build/core/add-application.mk index a01246a54..e2705dfcf 100644 --- a/build/core/add-application.mk +++ b/build/core/add-application.mk @@ -119,16 +119,6 @@ ifneq (,$(call gt,$(APP_PLATFORM_LEVEL),21)) override APP_PLATFORM := android-21 endif -#ifneq (,$(filter 13,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-12 -#endif -#ifneq (,$(filter 15,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-14 -#endif -#ifneq (,$(filter 17,$(APP_PLATFORM_LEVEL))) -# override APP_PLATFORM := android-16 -#endif - ifneq ($(strip $(subst android-,,$(APP_PLATFORM))),$(APP_PLATFORM_LEVEL)) $(call ndk_log, Adjusting APP_PLATFORM android-$(APP_PLATFORM_LEVEL) to $(APP_PLATFORM)) endif diff --git a/build/tools/build-gcc.sh b/build/tools/build-gcc.sh index 8425b9434..1339e8b81 100755 --- a/build/tools/build-gcc.sh +++ b/build/tools/build-gcc.sh @@ -287,9 +287,6 @@ export CFLAGS LDFLAGS CFLAGS_FOR_BUILD LDFLAGS_FOR_BUILD # This extra flag is used to slightly speed up the build EXTRA_CONFIG_FLAGS="--disable-bootstrap" -# This is to disable GCC 4.6 specific features that don't compile well -# the flags are ignored for older GCC versions. -EXTRA_CONFIG_FLAGS=$EXTRA_CONFIG_FLAGS" --disable-libquadmath" if [ "$DARWIN" = "yes" ]; then # Disable plugin because in canadian cross build, plugin gengtype # will be incorrectly linked with build's library and fails. diff --git a/build/tools/build-gnu-libstdc++.sh b/build/tools/build-gnu-libstdc++.sh index 2f13f3fe5..a2855fae0 100755 --- a/build/tools/build-gnu-libstdc++.sh +++ b/build/tools/build-gnu-libstdc++.sh @@ -168,6 +168,11 @@ build_gnustl_for_abi () exit 1 fi + EXTRA_FLAGS="-ffunction-sections -fdata-sections" + if [ -n "$THUMB" ] ; then + EXTRA_FLAGS="$EXTRA_FLAGS -mthumb" + fi + case $ARCH in arm) BUILD_HOST=arm-linux-androideabi @@ -189,10 +194,6 @@ build_gnustl_for_abi () ;; esac - EXTRA_FLAGS="-ffunction-sections -fdata-sections" - if [ -n "$THUMB" ] ; then - EXTRA_FLAGS="-mthumb" - fi CFLAGS="-fPIC $CFLAGS --sysroot=$SYSROOT -fexceptions -funwind-tables -D__BIONIC__ -O2 $EXTRA_FLAGS" CXXFLAGS="-fPIC $CXXFLAGS --sysroot=$SYSROOT -fexceptions -frtti -funwind-tables -D__BIONIC__ -O2 $EXTRA_FLAGS" CPPFLAGS="$CPPFLAGS --sysroot=$SYSROOT" diff --git a/build/tools/build-llvm.sh b/build/tools/build-llvm.sh index 4c182bc47..1d1cee3cc 100755 --- a/build/tools/build-llvm.sh +++ b/build/tools/build-llvm.sh @@ -356,6 +356,15 @@ if [ "$MCLINKER" = "yes" -o "$TOOLCHAIN" = "llvm-$DEFAULT_LLVM_VERSION" ] ; then fail_panic "Couldn't copy mclinker source: $MCLINKER_SRC_DIR" CXXFLAGS="$CXXFLAGS -fexceptions" # optimized/ScriptParser.cc needs it + if [ "$MINGW" = "yes" ] ; then + # Windows dll targets is already build with position independent code, so adding + # -fPIC is considered insult to mingw-64 compilers which complains and dies + # if -Werror is also on + # + # addng .../mclinker/lib/ADT/StringEntry.cpp:1:0: error: -fPIC ignored for target (all code is position independent) [-Werror] + # + CXXFLAGS="$CXXFLAGS -Wno-error" + fi export CXXFLAGS cd $MCLINKER_SRC_DIR && run ./autogen.sh diff --git a/build/tools/make-standalone-toolchain.sh b/build/tools/make-standalone-toolchain.sh index 0d4ce8218..4919944c4 100755 --- a/build/tools/make-standalone-toolchain.sh +++ b/build/tools/make-standalone-toolchain.sh @@ -526,7 +526,7 @@ case "$ARCH" in run copy_directory_nolinks "$SRC_SYSROOT_LIB/../lib64r2" "$TMPDIR/sysroot/usr/lib64r2" ;; mips) - if [ "$GCC_VERSION" == "4.9" ]; then + if [ "$GCC_VERSION" = "4.9" ]; then run copy_directory_nolinks "$SRC_SYSROOT_LIB/../libr2" "$TMPDIR/sysroot/usr/libr2" run copy_directory_nolinks "$SRC_SYSROOT_LIB/../libr6" "$TMPDIR/sysroot/usr/libr6" fi @@ -715,7 +715,7 @@ copy_stl_libs_for_abi () { fi ;; mips) - if [ "$STL" = "gnustl" -a "$GCC_VERSION" == "4.9" ]; then + if [ "$STL" = "gnustl" -a "$GCC_VERSION" = "4.9" ]; then copy_stl_libs mips "bits" "bits" "../lib" "lib" copy_stl_libs mips "mips-r2/bits" "mips-r2/bits" "../libr2" "libr2" copy_stl_libs mips "mips-r6/bits" "mips-r6/bits" "../libr6" "libr6" diff --git a/build/tools/package-release.sh b/build/tools/package-release.sh index c7a1c7cc0..4c20a4d30 100755 --- a/build/tools/package-release.sh +++ b/build/tools/package-release.sh @@ -433,6 +433,11 @@ for SYSTEM in $SYSTEMS; do copy_directory "$REFERENCE" "$DSTDIR" fail_panic "Could not copy reference. Aborting." + if [ "$DSTDIR" != "$DSTDIR64" ]; then + copy_directory "$DSTDIR" "$DSTDIR64" + echo "$RELEASE (64-bit)" > $DSTDIR64/RELEASE.TXT + fi + if [ "$PREBUILT_NDK" ]; then cd $UNZIP_DIR/android-ndk-* && cp -rP toolchains/* $DSTDIR/toolchains/ fail_panic "Could not copy toolchain files from $PREBUILT_NDK" @@ -509,7 +514,7 @@ for SYSTEM in $SYSTEMS; do echo "Remove ld.mcld deployed/packaged earlier by accident " find $DSTDIR/toolchains $DSTDIR64/toolchains -name "*ld.mcld*" -exec rm -f {} \; - # Unpack llvm and clang + # Unpack clang/llvm for LLVM_VERSION in $LLVM_VERSION_LIST; do unpack_prebuilt llvm-$LLVM_VERSION-$SYSTEM "$DSTDIR" "$DSTDIR64" done @@ -553,6 +558,7 @@ for SYSTEM in $SYSTEMS; do # Remove duplicated files in case-insensitive file system if [ "$SYSTEM" = "windows" -o "$SYSTEM" = "darwin-x86" ]; then rm -rf $DSTDIR/tests/build/c++-stl-source-extensions + rm -rf $DSTDIR64/tests/build/c++-stl-source-extensions find "$DSTDIR/platforms" | sort -f | uniq -di | xargs rm find "$DSTDIR64/platforms" | sort -f | uniq -di | xargs rm fi @@ -570,14 +576,17 @@ for SYSTEM in $SYSTEMS; do fi case "$SYSTEM" in windows) - ARCHIVE64="$ARCHIVE-64bit-tools.zip" + ARCHIVE64="${ARCHIVE}_64.zip" ARCHIVE="$ARCHIVE.zip" ;; *) - ARCHIVE64="$ARCHIVE-64bit-tools.tar.bz2" + ARCHIVE64="${ARCHIVE}_64.tar.bz2" ARCHIVE="$ARCHIVE.tar.bz2" ;; esac + if [ "$TRY64" = "yes" ]; then + ARCHIVE=$ARCHIVE64 + fi echo "Creating $ARCHIVE" # make all file universally readable, and all executable (including directory) # universally executable, punt intended diff --git a/build/tools/patch-sources.sh b/build/tools/patch-sources.sh index 6fc027465..66c6ffe52 100755 --- a/build/tools/patch-sources.sh +++ b/build/tools/patch-sources.sh @@ -75,9 +75,13 @@ PATCHES=`echo $PATCHES | sed -e s%^\./%%g` for PATCH in $PATCHES; do PATCHDIR=`dirname $PATCH` PATCHNAME=`basename $PATCH` - log "Applying $PATCHNAME into $SRC_DIR/$PATCHDIR" - cd $SRC_DIR/$PATCHDIR && patch $REVERSE -p1 < $PATCHES_DIR/$PATCH - fail_panic "Patch failure with $PATCHES_DIR/$PATCH!! !! Please check your patches directory!" + if [ -d $SRC_DIR/$PATCHDIR ]; then + log "Applying $PATCHNAME into $SRC_DIR/$PATCHDIR" + cd $SRC_DIR/$PATCHDIR && patch $REVERSE -p1 < $PATCHES_DIR/$PATCH + fail_panic "Patch failure with $PATCHES_DIR/$PATCH!! !! Please check your patches directory!" + else + echo "Ignore non-existance $SRC_DIR/$PATCHDIR" + fi done dump "Done!" diff --git a/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch b/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch index d06d9f205..6cd48a336 100644 --- a/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch +++ b/build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch @@ -26,7 +26,7 @@ index 473fceb..1d9248b 100644 + 2014-10-29 Kyrylo Tkachov <kyrylo.tkachov@arm.com> - PR tree-optimization/63530 + * config/aarch64/aarch64.c (aarch64_madd_needs_nop): Restore diff --git a/gcc-4.9/gcc/config/arm/arm.md b/gcc-4.9/gcc/config/arm/arm.md index 467f9ce..13c9b37 100644 --- a/gcc-4.9/gcc/config/arm/arm.md diff --git a/sources/android/cpufeatures/cpu-features.c b/sources/android/cpufeatures/cpu-features.c index 1769d2e94..d75eebcb5 100644 --- a/sources/android/cpufeatures/cpu-features.c +++ b/sources/android/cpufeatures/cpu-features.c @@ -123,7 +123,8 @@ static __inline__ void x86_cpuid(int func, int values[4]) static int get_file_size(const char* pathname) { - int fd, ret, result = 0; + + int fd, result = 0; char buffer[256]; fd = open(pathname, O_RDONLY); @@ -195,7 +196,7 @@ extract_cpuinfo_field(const char* buffer, int buflen, const char* field) int fieldlen = strlen(field); const char* bufend = buffer + buflen; char* result = NULL; - int len, ignore; + int len; const char *p, *q; /* Look for first field occurence, and ensures it starts the line. */ @@ -902,7 +903,7 @@ android_cpuInit(void) ANDROID_CPU_ARM_FEATURE_IDIV_THUMB2 }, { 0x510006f3, ANDROID_CPU_ARM_FEATURE_IDIV_ARM | ANDROID_CPU_ARM_FEATURE_IDIV_THUMB2 }, - }; + }; size_t n; for (n = 0; n < sizeof(cpu_fixes)/sizeof(cpu_fixes[0]); ++n) { const struct CpuFix* entry = &cpu_fixes[n]; diff --git a/sources/android/support/Android.mk b/sources/android/support/Android.mk index ea9207975..df7d96599 100644 --- a/sources/android/support/Android.mk +++ b/sources/android/support/Android.mk @@ -144,7 +144,8 @@ include $(CLEAR_VARS) LOCAL_MODULE := android_support LOCAL_SRC_FILES := $(android_support_sources) LOCAL_C_INCLUDES := $(android_support_c_includes) -LOCAL_CFLAGS += -Drestrict=__restrict__ -ffunction-sections -fdata-sections -fvisibility=hidden -fvisibility-inlines-hidden +LOCAL_CFLAGS += -Drestrict=__restrict__ -ffunction-sections -fdata-sections -fvisibility=hidden +LOCAL_CPPFLAGS += -fvisibility-inlines-hidden # These Clang warnings are triggered by the Musl sources. The code is fine, # but we don't want to modify it. TODO(digit): This is potentially dangerous, 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 |