Add clang3.2 to test list
Change-Id: I2970b62c7bf2b6df5c7d56622fbd879237341bc3
diff --git a/tests/build/flto/BROKEN_BUILD b/tests/build/flto/BROKEN_BUILD
index fc3196c..6578b73 100644
--- a/tests/build/flto/BROKEN_BUILD
+++ b/tests/build/flto/BROKEN_BUILD
@@ -1 +1 @@
-clang3.1 4.4.3
+clang3.1 clang3.2 4.4.3
diff --git a/tests/build/issue41770-_GLIBCXX_HAS_GTHREADS/BROKEN_BUILD b/tests/build/issue41770-_GLIBCXX_HAS_GTHREADS/BROKEN_BUILD
index 707028f..06a1475 100644
--- a/tests/build/issue41770-_GLIBCXX_HAS_GTHREADS/BROKEN_BUILD
+++ b/tests/build/issue41770-_GLIBCXX_HAS_GTHREADS/BROKEN_BUILD
@@ -1 +1 @@
-clang3.1 4.4.3 4.6
\ No newline at end of file
+clang3.1 clang3.2 4.4.3 4.6
\ No newline at end of file
diff --git a/tests/build/mips-fp4/BROKEN_BUILD b/tests/build/mips-fp4/BROKEN_BUILD
index 02bef2a..17d604b 100644
--- a/tests/build/mips-fp4/BROKEN_BUILD
+++ b/tests/build/mips-fp4/BROKEN_BUILD
@@ -1 +1 @@
-clang3.1
\ No newline at end of file
+clang3.1 clang3.2
\ No newline at end of file
diff --git a/tests/device/test-openmp/BROKEN_BUILD b/tests/device/test-openmp/BROKEN_BUILD
index 02bef2a..17d604b 100644
--- a/tests/device/test-openmp/BROKEN_BUILD
+++ b/tests/device/test-openmp/BROKEN_BUILD
@@ -1 +1 @@
-clang3.1
\ No newline at end of file
+clang3.1 clang3.2
\ No newline at end of file
diff --git a/tests/device/test-stlport/BROKEN_RUN b/tests/device/test-stlport/BROKEN_RUN
index 02bef2a..17d604b 100644
--- a/tests/device/test-stlport/BROKEN_RUN
+++ b/tests/device/test-stlport/BROKEN_RUN
@@ -1 +1 @@
-clang3.1
\ No newline at end of file
+clang3.1 clang3.2
\ No newline at end of file
diff --git a/tests/run-tests-all.sh b/tests/run-tests-all.sh
index 6bfd2f5..9cea1e2 100755
--- a/tests/run-tests-all.sh
+++ b/tests/run-tests-all.sh
@@ -67,54 +67,48 @@
# Run run-tests.sh
#
SYSTEM=$(get_prebuilt_host_tag)
+NDK_TOOLCHAIN_VERSIONS=
+for V in $DEFAULT_GCC_VERSION_LIST; do
+ NDK_TOOLCHAIN_VERSIONS=$NDK_TOOLCHAIN_VERSIONS" gcc"$V
+done
+for V in $DEFAULT_LLVM_VERSION_LIST; do
+ NDK_TOOLCHAIN_VERSIONS=$NDK_TOOLCHAIN_VERSIONS" clang"$V
+done
# keep this simple, only intend to test the case when NDK_TOOLCHAIN_VERSION isn't specified
dump "### Run simple tests"
ANDROID_SERIAL=none ./run-tests.sh --continue-on-build-fail --abi=armeabi
+# Another simple test to test NDK_TOOLCHAIN_VERSION=clang which picks up the most recent version
+dump "### Run simple tests with clang"
+NDK_TOOLCHAIN_VERSION=clang ANDROID_SERIAL=none ./run-tests.sh --continue-on-build-fail --abi=armeabi-v7a
# enumerate all cases using $SYSTEM toolchain
-dump "### Running $SYSTEM gcc 4.7 full tests"
-NDK_TOOLCHAIN_VERSION=4.7 ./run-tests.sh --continue-on-build-fail --full
-dump "### Running $SYSTEM gcc 4.6 full tests"
-NDK_TOOLCHAIN_VERSION=4.6 ./run-tests.sh --continue-on-build-fail --full
-dump "### Running $SYSTEM gcc 4.4.3 full tests"
-NDK_TOOLCHAIN_VERSION=4.4.3 ./run-tests.sh --continue-on-build-fail --full
-dump "### Running $SYSTEM clang 3.1 full tests"
-NDK_TOOLCHAIN_VERSION=clang3.1 ./run-tests.sh --continue-on-build-fail --full
+for V in $NDK_TOOLCHAIN_VERSIONS; do
+ dump "### Running $HOST_TAG $V full tests"
+ NDK_TOOLCHAIN_VERSION="${V#gcc*}" ./run-tests.sh --continue-on-build-fail --full
+done
if [ "$TEST_HOST_32BIT" = "yes" ] ; then
- dump "### Running $SYSTEM gcc 4.7 tests (32-bit host)"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.7 ./run-tests.sh --continue-on-build-fail
- dump "### Running $SYSTEM gcc 4.6 tests (32-bit host)"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.6 ./run-tests.sh --continue-on-build-fail
- dump "### Running $SYSTEM gcc 4.4.3 tests (32-bit host)"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.4.3 ./run-tests.sh --continue-on-build-fail
- dump "### Running $SYSTEM clang 3.1 tests (32-bit host)"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=clang3.1 ./run-tests.sh --continue-on-build-fail
+ for V in $NDK_TOOLCHAIN_VERSIONS; do
+ dump "### Running $HOST_TAG32 $V tests (32-bit host)"
+ NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION="${V#gcc*}" ./run-tests.sh --continue-on-build-fail
+ done
fi
if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows-x86_64" ] ; then
# using 64-bit windows toolchain
- dump "### Running windows-x86_64 4.7 tests"
- NDK_TOOLCHAIN_VERSION=4.7 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows-x86_64 4.6 tests"
- NDK_TOOLCHAIN_VERSION=4.6 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows-x86_64 4.4.3 tests"
- NDK_TOOLCHAIN_VERSION=4.4.3 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows-x86_64 clang 3.1 tests"
- NDK_TOOLCHAIN_VERSION=clang3.1 ./run-tests.sh --continue-on-build-fail --wine # --full
+ for V in $NDK_TOOLCHAIN_VERSIONS; do
+ dump "### Running windows-x86_64 $V tests"
+ NDK_TOOLCHAIN_VERSION="${V#gcc*}" ./run-tests.sh --continue-on-build-fail --wine # --full
+ done
fi
if [ "$SYSTEM" = "linux-x86" -a -d "$NDK/toolchains/arm-linux-androideabi-4.6/prebuilt/windows" ] ; then
# using 32-bit windows toolchain
- dump "### Running windows 4.7 tests"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.7 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows 4.6 tests"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.6 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows 4.4.3 tests"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=4.4.3 ./run-tests.sh --continue-on-build-fail --wine # --full
- dump "### Running windows clang 3.1 tests"
- NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION=clang3.1 ./run-tests.sh --continue-on-build-fail --wine # --full
+ for V in $NDK_TOOLCHAIN_VERSIONS; do
+ dump "### Running windows $V tests"
+ NDK_HOST_32BIT=1 NDK_TOOLCHAIN_VERSION="${V#gcc*}" ./run-tests.sh --continue-on-build-fail --wine # --full
+ done
fi
# add more if you want ...
@@ -161,24 +155,29 @@
}
API=14
-LLVM_VERSION=$DEFAULT_LLVM_VERSION
for ARCH in $(commas_to_spaces $DEFAULT_ARCHS); do
for GCC_VERSION in $(commas_to_spaces $DEFAULT_GCC_VERSION_LIST); do
for TAG in $TAGS; do
dump "### [$TAG] Testing $ARCH gcc-$GCC_VERSION toolchain with --sysroot"
(cd $NDK && \
./tests/standalone/run.sh --prefix=$(get_toolchain_binprefix_for_arch $ARCH $GCC_VERSION $TAG)-gcc)
- dump "### [$TAG] Making $ARCH gcc-$GCC_VERSION standalone toolchain"
- make_standalone $TAG $API $ARCH $GCC_VERSION $LLVM_VERSION
- dump "### [$TAG] Testing $ARCH gcc-$GCC_VERSION standalone toolchain"
- (cd $NDK && \
- ./tests/standalone/run.sh --no-sysroot \
- --prefix=$(standalone_path $TAG $API $ARCH $GCC_VERSION)/bin/$(get_default_toolchain_prefix_for_arch $ARCH)-gcc)
- dump "### [$TAG] Testing clang in $ARCH gcc-$GCC_VERSION standalone toolchain"
- (cd $NDK && \
- ./tests/standalone/run.sh --no-sysroot \
- --prefix=$(standalone_path $TAG $API $ARCH $GCC_VERSION)/bin/clang)
- rm -rf $(standalone_path $TAG $API $ARCH $GCC_VERSION)
+ GCC_TESTED=no
+ for LLVM_VERSION in $(commas_to_spaces $DEFAULT_LLVM_VERSION_LIST); do
+ dump "### [$TAG] Making $ARCH gcc-$GCC_VERSION/clang$LLVM_VERSION standalone toolchain"
+ make_standalone $TAG $API $ARCH $GCC_VERSION $LLVM_VERSION
+ if [ "$GCC_TESTED" != "yes" ]; then
+ dump "### [$TAG] Testing $ARCH gcc-$GCC_VERSION standalone toolchain"
+ (cd $NDK && \
+ ./tests/standalone/run.sh --no-sysroot \
+ --prefix=$(standalone_path $TAG $API $ARCH $GCC_VERSION)/bin/$(get_default_toolchain_prefix_for_arch $ARCH)-gcc)
+ GCC_TESTED=yes
+ fi
+ dump "### [$TAG] Testing clang$LLVM_VERSION in $ARCH gcc-$GCC_VERSION standalone toolchain"
+ (cd $NDK && \
+ ./tests/standalone/run.sh --no-sysroot \
+ --prefix=$(standalone_path $TAG $API $ARCH $GCC_VERSION)/bin/clang)
+ rm -rf $(standalone_path $TAG $API $ARCH $GCC_VERSION)
+ done
done
done
done
