Skip to content

Commit 17ec764

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 17ec764

File tree

1 file changed

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

1 file changed

+4
-4
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ 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 && \
7+
../x.py --stage 1 test --skip src/tools/tidy
88
# Run the `mir-opt` tests again but this time for a 32-bit target.
99
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
1010
# both 32-bit and 64-bit outputs updated by the PR author, before
1111
# the PR is approved and tested for merging.
1212
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
1313
# despite having different output on 32-bit vs 64-bit targets.
1414
../x.py --stage 1 test tests/mir-opt \
15-
--host='' --target=i686-unknown-linux-gnu && \
15+
--host='' --target=i686-unknown-linux-gnu
1616
# Run `ui-fulldeps` in `--stage=1`, which actually uses the stage0
1717
# compiler, and is sensitive to the addition of new flags.
1818
../x.py --stage 1 test tests/ui-fulldeps
1919
fi
2020

2121
# 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 && \
22+
../x.py --stage 2 test --skip src/tools/tidy
2323
# Run the `mir-opt` tests again but this time for a 32-bit target.
2424
# This enforces that tests using `// EMIT_MIR_FOR_EACH_BIT_WIDTH` have
2525
# both 32-bit and 64-bit outputs updated by the PR author, before
2626
# the PR is approved and tested for merging.
2727
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
2828
# despite having different output on 32-bit vs 64-bit targets.
2929
../x --stage 2 test tests/mir-opt \
30-
--host='' --target=i686-unknown-linux-gnu && \
30+
--host='' --target=i686-unknown-linux-gnu
3131
# Run the UI test suite again, but in `--pass=check` mode
3232
#
3333
# This is intended to make sure that both `--pass=check` continues to

0 commit comments

Comments
 (0)