diff options
| author | Albin <albin@mullvad.net> | 2024-02-07 16:14:41 +0100 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2024-02-07 16:14:41 +0100 |
| commit | 20d9c98f5ec44166b461730fec9ca292b622265f (patch) | |
| tree | 5b7a388f3216a07d90bc6f722feb772626189c80 /android | |
| parent | 00de7637fd8fe8480022489af3c0cee2dc706d30 (diff) | |
| parent | 45575e542d79ffb9e5936a52c5dadd772bfbe7b7 (diff) | |
| download | mullvadvpn-20d9c98f5ec44166b461730fec9ca292b622265f.tar.xz mullvadvpn-20d9c98f5ec44166b461730fec9ca292b622265f.zip | |
Merge branch 'fix-android-test-runner-label-droid-672'
Diffstat (limited to 'android')
| -rwxr-xr-x | android/scripts/run-instrumented-tests.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/android/scripts/run-instrumented-tests.sh b/android/scripts/run-instrumented-tests.sh index e72d4687bd..0288439f56 100755 --- a/android/scripts/run-instrumented-tests.sh +++ b/android/scripts/run-instrumented-tests.sh @@ -10,8 +10,10 @@ AUTO_FETCH_TEST_HELPER_APKS=${AUTO_FETCH_TEST_HELPER_APKS:-"false"} APK_BASE_DIR=${APK_BASE_DIR:-"$SCRIPT_DIR/.."} LOG_FAILURE_MESSAGE="FAILURES!!!" -DEFAULT_ORCHESTRATOR_APK_PATH=/tmp/orchestrator.apk -DEFAULT_TEST_SERVICES_APK_PATH=/tmp/test-services.apk +TEMP_DIR=$(mktemp -d -t test-run-XXXX) + +DEFAULT_ORCHESTRATOR_APK_PATH=$TEMP_DIR/orchestrator.apk +DEFAULT_TEST_SERVICES_APK_PATH=$TEMP_DIR/test-services.apk ORCHESTRATOR_URL=https://dl.google.com/android/maven2/androidx/test/orchestrator/1.4.2/orchestrator-1.4.2.apk TEST_SERVICES_URL=https://dl.google.com/android/maven2/androidx/test/services/test-services/1.4.2/test-services-1.4.2.apk @@ -141,7 +143,7 @@ case "$TEST_TYPE" in ;; esac -LOCAL_TMP_REPORT_PATH="/tmp/mullvad-$TEST_TYPE-instrumentation-report" +LOCAL_TMP_REPORT_PATH="$TEMP_DIR/mullvad-$TEST_TYPE-instrumentation-report" INSTRUMENTATION_LOG_FILE_PATH="$LOCAL_TMP_REPORT_PATH/instrumentation-log.txt" LOGCAT_FILE_PATH="$LOCAL_TMP_REPORT_PATH/logcat.txt" LOCAL_SCREENSHOT_PATH="$LOCAL_TMP_REPORT_PATH/screenshots" @@ -232,3 +234,5 @@ if grep -q "$LOG_FAILURE_MESSAGE" "$INSTRUMENTATION_LOG_FILE_PATH"; then else echo "No failures!" fi + +rm -rf "$TEMP_DIR" |