diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-03-05 12:54:28 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2025-03-05 12:54:28 +0100 |
| commit | ec359a9b014e2e9c82bc3cff32378647bd92f8d6 (patch) | |
| tree | bbc521444e2cd3f5a0932183c902775ce91c230a /test | |
| parent | d507647cef581a84d06e39ead801be78a3f9120e (diff) | |
| parent | 8f61a6fad2488858df6f86ac8e8b5a61eed5af1e (diff) | |
| download | mullvadvpn-ec359a9b014e2e9c82bc3cff32378647bd92f8d6.tar.xz mullvadvpn-ec359a9b014e2e9c82bc3cff32378647bd92f8d6.zip | |
Merge branch 'fix-desktop-e2e-workflow'
Diffstat (limited to 'test')
| -rwxr-xr-x | test/scripts/build/runner-image.sh | 4 | ||||
| -rwxr-xr-x | test/scripts/utils/lib.sh | 4 | ||||
| -rwxr-xr-x | test/test-by-version.sh | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/test/scripts/build/runner-image.sh b/test/scripts/build/runner-image.sh index 47c41b2e38..bb0b37755e 100755 --- a/test/scripts/build/runner-image.sh +++ b/test/scripts/build/runner-image.sh @@ -23,8 +23,8 @@ echo "************************************************************" echo "* Preparing test runner image: $TARGET" echo "************************************************************" -mkdir -p "${TEST_FRAMEWORK_REPO}/testrunner-images" -TEST_RUNNER_IMAGE_PATH="${TEST_FRAMEWORK_REPO}/testrunner-images/${TEST_RUNNER_IMAGE_FILENAME}" +mkdir -p "${TEST_FRAMEWORK_ROOT}/testrunner-images" +TEST_RUNNER_IMAGE_PATH="${TEST_FRAMEWORK_ROOT}/testrunner-images/${TEST_RUNNER_IMAGE_FILENAME}" case $TARGET in diff --git a/test/scripts/utils/lib.sh b/test/scripts/utils/lib.sh index dd1630dc33..55b98f89cb 100755 --- a/test/scripts/utils/lib.sh +++ b/test/scripts/utils/lib.sh @@ -230,8 +230,8 @@ function run_tests_for_os { test_manager="${TEST_DIST_DIR%/}/test-manager" runner_dir_flag=("--runner-dir" "$TEST_DIST_DIR") else - # Assume test-manager is in path. - test_manager="$(which test-manager)" + # Build & run test-manager + test_manager="cargo run --bin test-manager" runner_dir_flag=() fi diff --git a/test/test-by-version.sh b/test/test-by-version.sh index 3b97d45461..7ce6ff9a7e 100755 --- a/test/test-by-version.sh +++ b/test/test-by-version.sh @@ -59,6 +59,9 @@ echo "**********************************" echo "* Downloading app packages" echo "**********************************" +# shellcheck source=test/scripts/utils/download.sh +source "scripts/utils/download.sh" + download_app_package "$APP_VERSION" "$TEST_OS" download_e2e_executable "$APP_VERSION" "$TEST_OS" |