Fix run-gtests.sh for both 32- and 64-bit tests.
When running both sets, the script was concatenating the
last test from first set with the first test from the
second set.
Test: run-gtests.sh for full aosp_taimen-userdebug build.
Change-Id: I49a1b0f3f50305d412daeec1449481d138a0c635
diff --git a/tools/run-gtests.sh b/tools/run-gtests.sh
index 7360ddd..be6e207 100755
--- a/tools/run-gtests.sh
+++ b/tools/run-gtests.sh
@@ -17,12 +17,13 @@
# Script to run all gtests located under $ART_TEST_CHROOT/data/nativetest{64}
ADB="${ADB:-adb}"
-all_tests=()
+all_tests=
failing_tests=()
function add_tests {
# Search for *_test and *_tests executables, but skip e.g. libfoo_test.so.
- all_tests+=$(${ADB} shell "test -d $ART_TEST_CHROOT/$1 && chroot $ART_TEST_CHROOT find $1 -type f -perm /ugo+x -name \*_test\* \! -name \*.so")
+ local found_tests=$(${ADB} shell "test -d $ART_TEST_CHROOT/$1 && chroot $ART_TEST_CHROOT find $1 -type f -perm /ugo+x -name \*_test\* \! -name \*.so")
+ all_tests+=" $found_tests"
}
function fail {