diff options
author | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-05 19:06:51 +0800 |
---|---|---|
committer | Andrew Hsieh <andrewhsieh@google.com> | 2014-12-05 19:23:45 +0800 |
commit | 5297f237f2d5e40967dcfe19bfd11639b0e7223f (patch) | |
tree | 7bfb5332f45f98129f729e37cd1d6d96347d264b /tests/run-tests.sh | |
parent | ce90c072c2d13e840ff2aaedf4b235b64b0c1d6c (diff) | |
download | ndk-5297f237f2d5e40967dcfe19bfd11639b0e7223f.tar.gz |
misc fixes in r10d
1. Remove hack for server where android-13,15,17 were missing
2. Remove --disable-libquadmath
3. Fixed build-gnu-libstdc++.sh thumb build where
"-ffunction-sections -fdata-sections" were dropped
4. Fixed llvm clang3.5/windows build where mingw-64 complains about -fPIC
5. Fixed bashism in make-standalone-toolchain.sh
6. Fixed "package-release.sh --separate-64"
7. Relaxed patch-sources.sh against non-existance patch directory
8. Refresh build/tools/toolchain-patches/gcc/0010-Fix-PR-target-63209.patch
9. Fixed warning about unused vars in cpu-features.c
10. Fixed sources/android/support/Android.mk about -fvisibility-inlines-hidden
is only foo C++
11. Fixed tests/build/check-armeabi-v7a-prebuilts/build.sh on MacOSX 10.6.8
12. Fixed tests/build/issue64679-prctl/build.sh to include GLES2/gl2ext.h
which can be compiled alone now
13. Excluded tests/device/b8708181-Vector4/jni/Vector4.cpp from clang3.4
14. Removed some comments in tests/device/test-libc++-*-full/jni/Android.mk
15. misc run-test.sh fixes
16. Disable integrated-as for clang in tests/build/issue79115-confusing-ld.gold-warning
Change-Id: I0afb2c00642dd61d81fd4842532d1b3c4029655b
Diffstat (limited to 'tests/run-tests.sh')
-rwxr-xr-x | tests/run-tests.sh | 28 |
1 files changed, 19 insertions, 9 deletions
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 |