diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-08-16 11:39:37 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-08-16 11:39:37 +0200 |
| commit | 5cb1a970afc4a723300efa0f5e9e3177947f055d (patch) | |
| tree | e903adf85fb40f6517c2e811aa881bc957af1cb0 /test/scripts | |
| parent | 4c137b49c33890193356d17cc085888bd74e7442 (diff) | |
| parent | 4ef27f854d99f154feabf8a04f9ad5241150a315 (diff) | |
| download | mullvadvpn-5cb1a970afc4a723300efa0f5e9e3177947f055d.tar.xz mullvadvpn-5cb1a970afc4a723300efa0f5e9e3177947f055d.zip | |
Merge branch 'test-manager-fixes'
Diffstat (limited to 'test/scripts')
| -rw-r--r-- | test/scripts/ssh-setup.sh | 3 | ||||
| -rwxr-xr-x | test/scripts/test-utils.sh | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/test/scripts/ssh-setup.sh b/test/scripts/ssh-setup.sh index 41131169e0..714756f45e 100644 --- a/test/scripts/ssh-setup.sh +++ b/test/scripts/ssh-setup.sh @@ -17,7 +17,7 @@ echo "Copying test-runner to $RUNNER_DIR" mkdir -p "$RUNNER_DIR" for file in test-runner connection-checker $APP_PACKAGE $PREVIOUS_APP $UI_RUNNER; do - echo "Moving $file to $RUNNER_DIR" + echo "Moving $SCRIPT_DIR/$file to $RUNNER_DIR" cp -f "$SCRIPT_DIR/$file" "$RUNNER_DIR" done @@ -106,6 +106,7 @@ fi setup_systemd function install_packages_apt { + echo "Installing required apt packages" apt update apt install -yf xvfb wireguard-tools curl curl -fsSL https://get.docker.com | sh diff --git a/test/scripts/test-utils.sh b/test/scripts/test-utils.sh index 75ad548701..3486483600 100755 --- a/test/scripts/test-utils.sh +++ b/test/scripts/test-utils.sh @@ -50,7 +50,7 @@ function get_package_dir { local package_dir if [[ -n "${PACKAGE_DIR+x}" ]]; then # Resolve the package dir to an absolute path since cargo must be invoked from the test directory - package_dir=$(cd "$PACKAGE_DIR" > /dev/null && pwd) + package_dir=$(realpath "$PACKAGE_DIR") elif [[ ("$(uname -s)" == "Darwin") ]]; then package_dir="$HOME/Library/Caches/mullvad-test/packages" elif [[ ("$(uname -s)" == "Linux") ]]; then |