aboutsummaryrefslogtreecommitdiff
path: root/android/test-shell.sh
diff options
context:
space:
mode:
authordigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-12-13 16:49:11 +0000
committerdigit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e>2013-12-13 16:49:11 +0000
commitba1f54c0934bd0420fbe79d1f774404967d63abf (patch)
treeefe89bfea29527b6e12757e6947843c533bd7bc8 /android/test-shell.sh
parentExpose the ability to supply additional user streams in the windows dump gene... (diff)
downloadbreakpad-ba1f54c0934bd0420fbe79d1f774404967d63abf.tar.xz
Misc Android-related fixes.
- src/common/android/testing/mkdtemp.h: Fixes a compilation error when using the (recent) NDK r9b, see comments in the source file for details. - android/test-driver, Makefile.am, Makefile.in: Autotools 1.12 changed the way tests are run during "make check" so add a new "custom test driver" to run tests on Android, and modify Makefile.am / Makefile.in accordingly. Otherwise, 'make check' tried to run the tests on the host. - android/test-shell.sh: Allow several tests to run in parallel on the device, by creating a custom test directory for each test process. This allows running "make check -j8" reliably. - src/common/linux/file_id_unittest.cc: Disable the SelfStrip test on Android, since it assumes a 'strip' executable is available on the target system where the test runs. BUG=NONE R=mark@chromium.org, ted.mielczarek@gmail.com TEST=android/run-checks.sh --ndk-dir=/path/to/android-ndk-r9b Review URL: https://breakpad.appspot.com/904003 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1259 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'android/test-shell.sh')
-rwxr-xr-xandroid/test-shell.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/android/test-shell.sh b/android/test-shell.sh
index 526e926a..3677d875 100755
--- a/android/test-shell.sh
+++ b/android/test-shell.sh
@@ -52,8 +52,9 @@ if [ ! -f "$TEST_PROGRAM" ]; then
fi
# Create test directory on the device
-TEST_DIR=/data/local/tmp/test-google-breakpad
-adb_shell mkdir "$TEST_DIR" || panic "Can't create test directory on device"
+TEST_DIR=/data/local/tmp/test-google-breakpad-$$
+adb_shell mkdir "$TEST_DIR" ||
+ panic "Can't create test directory on device: $TEST_DIR"
# Ensure that it is always removed when the script exits.
clean_test_dir () {