diff options
| author | David Lönnhager <david.l@mullvad.net> | 2024-04-28 19:45:45 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2024-04-29 13:34:19 +0200 |
| commit | d3bc638002e45b018ada611443da2055e4eec833 (patch) | |
| tree | 1f8856aa84e0f9cf4c2aba81d772baaa7c9014bb /test | |
| parent | 62a0955759603cb8cc5f0a5ae6d8376c475e676d (diff) | |
| download | mullvadvpn-d3bc638002e45b018ada611443da2055e4eec833.tar.xz mullvadvpn-d3bc638002e45b018ada611443da2055e4eec833.zip | |
Rename build.sh to build-runner.sh
This commit also updates ci-runtests.sh
Diffstat (limited to 'test')
| -rw-r--r-- | test/README.md | 12 | ||||
| -rwxr-xr-x | test/build-runner.sh (renamed from test/build.sh) | 0 | ||||
| -rwxr-xr-x | test/ci-runtests.sh | 8 |
3 files changed, 9 insertions, 11 deletions
diff --git a/test/README.md b/test/README.md index 97fc0760c0..7bbdbd901e 100644 --- a/test/README.md +++ b/test/README.md @@ -60,34 +60,34 @@ dnf install git gcc protobuf-devel libpcap-devel qemu \ # Building the test runner -Building the `test-runner` binary is done with the `build.sh` script. +Building the `test-runner` binary is done with the `build-runner.sh` script. Currently, only `x86_64` platforms are supported for Windows/Linux and `ARM64` (Apple Silicon) for macOS. -The `build.sh` requires the `$TARGET` environment variable to be set. +The `build-runner.sh` requires the `$TARGET` environment variable to be set. For example, building `test-runner` for Linux would look like this: ``` bash -./container-run.sh ./build.sh windows +./container-run.sh ./build-runner.sh windows ``` ## Linux Using `podman` is the recommended way to build the `test-runner`. See the [Linux section under Prerequisities](#Prerequisities) for more details. ``` bash -./container-run.sh ./build.sh linux +./container-run.sh ./build-runner.sh linux ``` ## macOS ``` bash -./build.sh macos +./build-runner.sh macos ``` ## Windows The `test-runner` binary for Windows may be cross-compiled from a Linux host. ``` bash -./container-run.sh ./build.sh windows +./container-run.sh ./build-runner.sh windows ``` # Building base images diff --git a/test/build.sh b/test/build-runner.sh index ef25d001c3..ef25d001c3 100755 --- a/test/build.sh +++ b/test/build-runner.sh diff --git a/test/ci-runtests.sh b/test/ci-runtests.sh index b4ea11246f..2ff5ef7304 100755 --- a/test/ci-runtests.sh +++ b/test/ci-runtests.sh @@ -220,15 +220,13 @@ echo "**********************************" find "$PACKAGES_DIR/" -type f ! \( -name "*${OLD_APP_VERSION}_*" -o -name "*${OLD_APP_VERSION}.*" -o -name "*${commit}*" \) -delete || true function build_test_runner { - local target="" if [[ "${TEST_OS}" =~ "debian"|"ubuntu"|"fedora" ]]; then - target="x86_64-unknown-linux-gnu" + ./container-run.sh ./build-runner.sh linux elif [[ "${TEST_OS}" =~ "windows" ]]; then - target="x86_64-pc-windows-gnu" + ./container-run.sh ./build-runner.sh windows elif [[ "${TEST_OS}" =~ "macos" ]]; then - target="aarch64-apple-darwin" + ./build-runner.sh macos fi - TARGET=$target ./build.sh } nice_time build_test_runner |