diff options
| author |  Peter Schmitt <schmitt@google.com> | 2016-08-10 15:14:54 +0000 |
|---|---|---|
| committer |  Yue Gan <yueg@google.com> | 2016-08-11 09:12:39 +0000 |
| commit | e47a5a97b5a2ccefe64cd52306eacbba97755e7f (patch) | |
| tree | 3d2118cf2a179e24bb358518fbe0b0ad7c304378 /tools/objc | |
| parent | f63c6fde315a1ca5ec0ace6a298b1e0b7b8118fd (diff) | |
Remove all temporary detrius upon exiting objc action scripts.
--
MOS_MIGRATED_REVID=129867284
Diffstat (limited to 'tools/objc')
| -rw-r--r-- | tools/objc/ios_runner.sh.mac_template | 4 | ||||
| -rw-r--r-- | tools/objc/ios_test.sh.bazel_template | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/tools/objc/ios_runner.sh.mac_template b/tools/objc/ios_runner.sh.mac_template index 785d693434..f28b7e7f35 100644 --- a/tools/objc/ios_runner.sh.mac_template +++ b/tools/objc/ios_runner.sh.mac_template @@ -105,7 +105,9 @@ trap "CleanupSimulator ${TEST_DEVICE_ID}" EXIT readonly STD_REDIRECT_DYLIB="$PWD/%std_redirect_dylib_path%" -readonly TEMP_DIR=$(mktemp -d -t bazel_temp) +readonly TEMP_DIR=$(mktemp -d "${TMPDIR:-/tmp}/bazel_temp.XXXXXX") +trap 'rm -rf "${TEMP_DIR}"' ERR EXIT + readonly APP_DIR="${TEMP_DIR}/extracted_app" mkdir "${APP_DIR}" diff --git a/tools/objc/ios_test.sh.bazel_template b/tools/objc/ios_test.sh.bazel_template index 43065edfb5..bafb95d4de 100644 --- a/tools/objc/ios_test.sh.bazel_template +++ b/tools/objc/ios_test.sh.bazel_template @@ -16,19 +16,25 @@ set -eu -TEST_APP_DIR="$(mktemp -d -t test_app_dir)" +TEMP_DIR="$(mktemp -d ${TMPDIR:-/tmp}/test_temp_dir.XXXXXX)" +trap 'rm -rf "${TEMP_DIR}"' ERR EXIT + +TEST_APP_DIR="${TEMP_DIR}/test_app_dir" +mkdir "${TEST_APP_DIR}" unzip -qq -d "${TEST_APP_DIR}" "%(test_app_ipa)s" TEST_APP_DIR="${TEST_APP_DIR}/Payload/%(test_app_name)s.app" -XCTEST_APP_DIR="$(mktemp -d -t xctest_app_dir)" +XCTEST_APP_DIR="${TEMP_DIR}/xctest_app_dir" +mkdir "${XCTEST_APP_DIR}" unzip -qq -d "${XCTEST_APP_DIR}" "%(xctest_app_ipa)s" XCTEST_APP_DIR="${XCTEST_APP_DIR}/Payload/%(xctest_app_name)s.xctest" killall "iOS Simulator" >/dev/null 2>/dev/null || : -SIMHOME="$(mktemp -d -t simhome)" +SIMHOME="${TEMP_DIR}/simhome" +mkdir "${SIMHOME}" -LOGFILE="$(mktemp -t logfile)" +LOGFILE="${TEMP_DIR}/logfile" SIMULATOR_PLATFORM="$(/usr/bin/xcrun --sdk iphonesimulator --show-sdk-platform-path)" SIMULATOR_DEV_LIBRARY="$SIMULATOR_PLATFORM/Developer/Library" |