diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-11 11:49:30 +0100 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2024-01-11 11:49:30 +0100 |
| commit | 6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba (patch) | |
| tree | 7d25c5e9a9066c7c97517bfbe39469242e0e08e5 /android/scripts | |
| parent | b5decd12a264c3e37092211eb0951dac6c640670 (diff) | |
| parent | b4167469808206ecc7ff2f788befe05e1d7ea57b (diff) | |
| download | mullvadvpn-6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba.tar.xz mullvadvpn-6c754c3a45fdb93bcb6f9e615c00e70aaa8d90ba.zip | |
Merge branch 'update-to-junit5-droid-569'
Diffstat (limited to 'android/scripts')
| -rwxr-xr-x | android/scripts/run-instrumented-tests.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/android/scripts/run-instrumented-tests.sh b/android/scripts/run-instrumented-tests.sh index 5c6ace121b..3d25480854 100755 --- a/android/scripts/run-instrumented-tests.sh +++ b/android/scripts/run-instrumented-tests.sh @@ -122,11 +122,13 @@ if [[ "$USE_ORCHESTRATOR" == "true" ]]; then am instrument -r -w \ -e targetInstrumentation $TEST_PACKAGE/androidx.test.runner.AndroidJUnitRunner \ -e clearPackageData true \ + -e runnerBuilder de.mannodermaus.junit5.AndroidJUnit5Builder \ ${OPTIONAL_TEST_ARGUMENTS:-""} \ androidx.test.orchestrator/androidx.test.orchestrator.AndroidTestOrchestrator" else INSTRUMENTATION_COMMAND="\ am instrument -w \ + -e runnerBuilder de.mannodermaus.junit5.AndroidJUnit5Builder \ $TEST_PACKAGE/androidx.test.runner.AndroidJUnitRunner" fi adb shell "$INSTRUMENTATION_COMMAND" | tee "$INSTRUMENTATION_LOG_FILE_PATH" |