Skip to content

Commit 8ff2954

Browse files
committed
Fix x64_64-gnu-llvm-15 CI tests
There were two command chains separated by `&&` in the script, and since `set -e` doesn't exit for chained commands, if the first chain has failed, the command would happily continue forward, ignoring any test failures.
1 parent 36b61e5 commit 8ff2954

File tree

1 file changed

+28
-28
lines changed
  • src/ci/docker/host-x86_64/x86_64-gnu-llvm-15

1 file changed

+28
-28
lines changed

src/ci/docker/host-x86_64/x86_64-gnu-llvm-15/script.sh

+28-28
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,34 @@ set -ex
44

55
# Only run the stage 1 tests on merges, not on PR CI jobs.
66
if [[ -z "${PR_CI_JOB}" ]]; then
7-
../x.py --stage 1 test --skip src/tools/tidy && \
8-
# Run the `mir-opt` tests again but this time for a 32-bit target.
9-
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
10-
# both 32-bit and 64-bit outputs updated by the PR author, before
11-
# the PR is approved and tested for merging.
12-
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
13-
# despite having different output on 32-bit vs 64-bit targets.
14-
../x.py --stage 1 test tests/mir-opt \
15-
--host='' --target=i686-unknown-linux-gnu && \
16-
# Run `ui-fulldeps` in `--stage=1`, which actually uses the stage0
17-
# compiler, and is sensitive to the addition of new flags.
18-
../x.py --stage 1 test tests/ui-fulldeps
7+
../x.py --stage 1 test --skip src/tools/tidy
8+
9+
# Run the `mir-opt` tests again but this time for a 32-bit target.
10+
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
11+
# both 32-bit and 64-bit outputs updated by the PR author, before
12+
# the PR is approved and tested for merging.
13+
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
14+
# despite having different output on 32-bit vs 64-bit targets.
15+
../x.py --stage 1 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu
16+
17+
# Run `ui-fulldeps` in `--stage=1`, which actually uses the stage0
18+
# compiler, and is sensitive to the addition of new flags.
19+
../x.py --stage 1 test tests/ui-fulldeps
1920
fi
2021

2122
# NOTE: intentionally uses all of `x.py`, `x`, and `x.ps1` to make sure they all work on Linux.
22-
../x.py --stage 2 test --skip src/tools/tidy && \
23-
# Run the `mir-opt` tests again but this time for a 32-bit target.
24-
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
25-
# both 32-bit and 64-bit outputs updated by the PR author, before
26-
# the PR is approved and tested for merging.
27-
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
28-
# despite having different output on 32-bit vs 64-bit targets.
29-
../x --stage 2 test tests/mir-opt \
30-
--host='' --target=i686-unknown-linux-gnu && \
31-
# Run the UI test suite again, but in `--pass=check` mode
32-
#
33-
# This is intended to make sure that both `--pass=check` continues to
34-
# work.
35-
#
36-
../x.ps1 --stage 2 test tests/ui --pass=check \
37-
--host='' --target=i686-unknown-linux-gnu
23+
../x.py --stage 2 test --skip src/tools/tidy
24+
25+
# Run the `mir-opt` tests again but this time for a 32-bit target.
26+
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
27+
# both 32-bit and 64-bit outputs updated by the PR author, before
28+
# the PR is approved and tested for merging.
29+
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
30+
# despite having different output on 32-bit vs 64-bit targets.
31+
../x --stage 2 test tests/mir-opt --host='' --target=i686-unknown-linux-gnu
32+
33+
# Run the UI test suite again, but in `--pass=check` mode
34+
#
35+
# This is intended to make sure that both `--pass=check` continues to
36+
# work.
37+
../x.ps1 --stage 2 test tests/ui --pass=check --host='' --target=i686-unknown-linux-gnu

0 commit comments

Comments
 (0)