summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2026-04-20 10:23:01 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2026-04-20 16:56:37 +0200
commit74f8345a557daad94a52a02f6420f1eb6c2b29a4 (patch)
treed86f7bb189dcc0158e28983f1381df5fb1e674e2
parenta77e14f081079a3f9078bb4cf6670e41d9612d2e (diff)
downloadmullvadvpn-74f8345a557daad94a52a02f6420f1eb6c2b29a4.tar.xz
mullvadvpn-74f8345a557daad94a52a02f6420f1eb6c2b29a4.zip
Rename `scripts/build` to `scripts/build-scripts`
-rw-r--r--test/README.md10
-rwxr-xr-xtest/scripts/build-scripts/runner-image.sh (renamed from test/scripts/build/runner-image.sh)0
-rwxr-xr-xtest/scripts/build-scripts/test-manager.sh (renamed from test/scripts/build/test-manager.sh)0
-rwxr-xr-xtest/scripts/build-scripts/test-runner.sh (renamed from test/scripts/build/test-runner.sh)0
-rwxr-xr-xtest/scripts/build.sh4
-rwxr-xr-xtest/scripts/utils/lib.sh6
6 files changed, 10 insertions, 10 deletions
diff --git a/test/README.md b/test/README.md
index fea575425f..5c1c392d96 100644
--- a/test/README.md
+++ b/test/README.md
@@ -117,33 +117,33 @@ Next: build the `test-runner`
### Building the test runner
-Building the `test-runner` binary is done with the `build/test-runner.sh` script.
+Building the `test-runner` binary is done with the `build-scripts/test-runner.sh` script.
Currently, only `x86_64` platforms are supported for Windows/Linux and `ARM64` (Apple Silicon) for macOS.
For example, building `test-runner` for Windows would look like this:
``` bash
-./scripts/container-run.sh ./scripts/build/test-runner.sh windows
+./scripts/container-run.sh ./scripts/build-scripts/test-runner.sh windows
```
#### Linux
Using `podman` is the recommended way to build the `test-runner`. See the [Linux section under Prerequisities](#prerequisites) for more details.
``` bash
-./scripts/container-run.sh ./scripts/build/test-runner.sh linux
+./scripts/container-run.sh ./scripts/build-scripts/test-runner.sh linux
```
#### macOS
``` bash
-./scripts/build/test-runner.sh macos
+./scripts/build-scripts/test-runner.sh macos
```
#### Windows
The `test-runner` binary for Windows may be cross-compiled from a Linux host.
``` bash
-./scripts/container-run.sh ./scripts/build/test-runner.sh windows
+./scripts/container-run.sh ./scripts/build-scripts/test-runner.sh windows
```
### Running the tests
diff --git a/test/scripts/build/runner-image.sh b/test/scripts/build-scripts/runner-image.sh
index bb0b37755e..bb0b37755e 100755
--- a/test/scripts/build/runner-image.sh
+++ b/test/scripts/build-scripts/runner-image.sh
diff --git a/test/scripts/build/test-manager.sh b/test/scripts/build-scripts/test-manager.sh
index 517bdf310f..517bdf310f 100755
--- a/test/scripts/build/test-manager.sh
+++ b/test/scripts/build-scripts/test-manager.sh
diff --git a/test/scripts/build/test-runner.sh b/test/scripts/build-scripts/test-runner.sh
index 05d2132679..05d2132679 100755
--- a/test/scripts/build/test-runner.sh
+++ b/test/scripts/build-scripts/test-runner.sh
diff --git a/test/scripts/build.sh b/test/scripts/build.sh
index 99b7b34942..bcc691d0b6 100755
--- a/test/scripts/build.sh
+++ b/test/scripts/build.sh
@@ -13,11 +13,11 @@ REPO_ROOT="$SCRIPT_DIR/../.."
build_linux() {
mkdir -p "$TEST_FRAMEWORK_ROOT/dist"
# Build the test manager
- "$SCRIPT_DIR/build/test-manager.sh" linux
+ "$SCRIPT_DIR/build-scripts/test-manager.sh" linux
cp "$TEST_FRAMEWORK_ROOT/target/release/test-manager" "$TEST_FRAMEWORK_ROOT/dist/"
# Build the test runner
- "$SCRIPT_DIR/build/test-runner.sh" linux
+ "$SCRIPT_DIR/build-scripts/test-runner.sh" linux
cp "$TEST_FRAMEWORK_ROOT/target/x86_64-unknown-linux-gnu/release/test-runner" "$TEST_FRAMEWORK_ROOT/dist/"
cp "$TEST_FRAMEWORK_ROOT/target/x86_64-unknown-linux-gnu/release/connection-checker" "$TEST_FRAMEWORK_ROOT/dist/"
diff --git a/test/scripts/utils/lib.sh b/test/scripts/utils/lib.sh
index ec383fe254..9656c9b92f 100755
--- a/test/scripts/utils/lib.sh
+++ b/test/scripts/utils/lib.sh
@@ -146,11 +146,11 @@ function build_test_runner {
script_dir="$(get_test_utils_dir)/../"
local test_os=${1:?Error: test os not set}
if [[ "${test_os}" =~ "debian"|"ubuntu"|"fedora" ]]; then
- "$script_dir"/container-run.sh scripts/build/test-runner.sh linux || exit 1
+ "$script_dir"/container-run.sh scripts/build-scripts/test-runner.sh linux || exit 1
elif [[ "${test_os}" =~ "windows" ]]; then
- "$script_dir"/container-run.sh scripts/build/test-runner.sh windows || exit 1
+ "$script_dir"/container-run.sh scripts/build-scripts/test-runner.sh windows || exit 1
elif [[ "${test_os}" =~ "macos" ]]; then
- "$script_dir"/build/test-runner.sh macos || exit 1
+ "$script_dir"/build-scripts/test-runner.sh macos || exit 1
fi
}