Misc Android-related fixes.

android/test-shell.sh

 #!/bin/sh
 #
 # Copyright (c) 2012 Google Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
@@ skipping 34 matching lines @@
 
 if [ -z "$TEST_PROGRAM" ]; then
   panic "No test program/script name on the command-line!"
 fi
 
 if [ ! -f "$TEST_PROGRAM" ]; then
   panic "Can't find test program/script: $TEST_PROGRAM"
 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"

[Mark Mentovai, 2013/12/13 14:24:28]

This goes past 80 columns. Wrap it.

[digit, 2013/12/13 15:40:19]

Done.

 
 # Ensure that it is always removed when the script exits.
 clean_test_dir () {
   # Don't care about success/failure, use '$ADB shell' directly.
   adb_shell rm -r "$TEST_DIR"
 }
 
 atexit clean_test_dir
 
 TEST_PROGRAM_NAME=$(basename "$TEST_PROGRAM")
@@ skipping 54 matching lines @@
 done
 
 # Copy test program to device
 adb_install "$TEST_PROGRAM" "$TEST_DIR"
 
 # Run it
 adb_shell "cd $TEST_DIR && LD_LIBRARY_PATH=. ./$TEST_PROGRAM_NAME $@"
 
 # Note: exiting here will call cleanup_exit which will remove the temporary
 #       files from the device.