diff options
| author | Nikita Popov <npopov@redhat.com> | 2025-07-15 13:33:32 +0000 |
|---|---|---|
| committer | Nikita Popov <npopov@redhat.com> | 2025-07-15 16:23:15 +0200 |
| commit | 4b421d44e20351426cf4ded11248bd1d0af40b5f (patch) | |
| tree | 1a1906022d47e792502f8b8ffb1e179d9a9c2f7b /src/ci/docker/scripts | |
| parent | 7f2065a4bae1faed5bab928c670964eafbf43b55 (diff) | |
| download | rust-4b421d44e20351426cf4ded11248bd1d0af40b5f.tar.gz rust-4b421d44e20351426cf4ded11248bd1d0af40b5f.zip | |
Fix handling of SCRIPT_ARG in docker images
Instead of making this a build parameter, pass the SCRIPT as an environment variable. To this purpose, normalize on always referring to a script in `/scripts`. For i686-gnu-nopt-2 I had to create a separate script, because Docker seems to be really terrible at command line argument parsing, so it's not possible to pass an environment variable that contains whitespace.
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/i686-gnu-nopt-2.sh | 6 | ||||
| -rwxr-xr-x | src/ci/docker/scripts/x86_64-gnu-llvm2.sh | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/i686-gnu-nopt-2.sh b/src/ci/docker/scripts/i686-gnu-nopt-2.sh new file mode 100755 index 00000000000..4c171739daf --- /dev/null +++ b/src/ci/docker/scripts/i686-gnu-nopt-2.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +python3 ../x.py test --stage 1 --set rust.optimize=false library/std && +/scripts/stage_2_test_set2.sh diff --git a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh index fe5382aaa48..0060b9bfd23 100755 --- a/src/ci/docker/scripts/x86_64-gnu-llvm2.sh +++ b/src/ci/docker/scripts/x86_64-gnu-llvm2.sh @@ -4,7 +4,7 @@ set -ex ##### Test stage 2 ##### -/tmp/stage_2_test_set1.sh +/scripts/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 |