diff options
| author | MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> | 2024-12-17 18:15:33 +0100 |
|---|---|---|
| committer | MarcoIeni <11428655+MarcoIeni@users.noreply.github.com> | 2024-12-17 18:15:33 +0100 |
| commit | 5980dfe063cea6135400046ce252a276ba8362bc (patch) | |
| tree | dfa5ce89d7bc60d1aa45bf2020e59e87ca139298 /src/ci/docker/scripts | |
| parent | 978c659b72ed7520332a74321dc8accf48b06d94 (diff) | |
| download | rust-5980dfe063cea6135400046ce252a276ba8362bc.tar.gz rust-5980dfe063cea6135400046ce252a276ba8362bc.zip | |
ci: remove duplicate task definition
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/stage_2_test_set1.sh | 9 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/stage_2_test_set2.sh (renamed from src/ci/docker/scripts/x86_64-gnu-llvm1.sh) | 2 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/x86_64-gnu-llvm.sh | 2 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/x86_64-gnu-llvm2.sh | 6 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/ci/docker/scripts/stage_2_test_set1.sh b/src/ci/docker/scripts/stage_2_test_set1.sh new file mode 100755 index 00000000000..3baff4b5221 --- /dev/null +++ b/src/ci/docker/scripts/stage_2_test_set1.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -ex + +# Run a subset of tests. Used to run tests in parallel in multiple jobs. + +../x.py --stage 2 test \ + --skip compiler \ + --skip src diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm1.sh b/src/ci/docker/scripts/stage_2_test_set2.sh index 56ef39aae15..872d758dce3 100755 --- a/src/ci/docker/scripts/x86_64-gnu-llvm1.sh +++ b/src/ci/docker/scripts/stage_2_test_set2.sh @@ -2,7 +2,7 @@ set -ex -/tmp/add_dummy_commit.sh +# Run a subset of tests. Used to run tests in parallel in multiple jobs. ../x.py --stage 2 test \ --skip tests \ diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm.sh b/src/ci/docker/scripts/x86_64-gnu-llvm.sh index e7dcc1ddff4..e0435a3ff5c 100755 --- a/src/ci/docker/scripts/x86_64-gnu-llvm.sh +++ b/src/ci/docker/scripts/x86_64-gnu-llvm.sh @@ -2,8 +2,6 @@ set -ex -/tmp/add_dummy_commit.sh - # NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux. ../x.py --stage 2 test --skip src/tools/tidy diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh index c9f6b98f01f..fe5382aaa48 100755 --- a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh +++ b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh @@ -2,13 +2,9 @@ set -ex -/tmp/add_dummy_commit.sh - ##### Test stage 2 ##### -../x.py --stage 2 test \ - --skip compiler \ - --skip src +/tmp/stage_2_test_set1.sh # Run the `mir-opt` tests again but this time for a 32-bit target. # This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have |
