Skip to content

Commit

Permalink
Applied LLVM 9 fixes to LLVM 9 PR CI Dockerfile
Browse files Browse the repository at this point in the history
Now with LLVM 9 being the minimum supported version, we can
finally remove the hacks in the dockerfile.

This wasn't in the main PR bumping the version as I didn't quite
understand what's going on and needed here.
  • Loading branch information
DevJPM committed Nov 15, 2020
1 parent 7504256 commit a015c21
Showing 1 changed file with 3 additions and 12 deletions.
15 changes: 3 additions & 12 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-9/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,22 +39,13 @@ ENV SCRIPT python2.7 ../x.py --stage 2 test --exclude src/tools/tidy && \
# the PR is approved and tested for merging.
# It will also detect tests lacking `// EMIT_MIR_FOR_EACH_BIT_WIDTH`,
# despite having different output on 32-bit vs 64-bit targets.
#
# HACK(eddyb) `armv5te` is used (not `i686`) to support older LLVM than LLVM 9:
# https://github.com/rust-lang/compiler-builtins/pull/311#issuecomment-612270089.
# This also requires `--pass=build` because we can't execute the tests
# on the `x86_64` host when they're built as `armv5te` binaries.
# (we're only interested in the MIR output, so this doesn't matter)
python2.7 ../x.py --stage 2 test src/test/mir-opt --pass=build \
--host='' --target=armv5te-unknown-linux-gnueabi && \
python2.7 ../x.py --stage 2 test src/test/mir-opt \
--host='' --target=i686-unknown-linux-gnu && \
# Run the UI test suite again, but in `--pass=check` mode
#
# This is intended to make sure that both `--pass=check` continues to
# work.
#
# FIXME: We ideally want to test this in 32-bit mode, but currently
# (due to the LLVM problems mentioned above) that isn't readily
# possible.
python2.7 ../x.py --stage 2 test src/test/ui --pass=check && \
python2.7 ../x.py --stage 2 test src/test/ui --pass=check --target=i686-unknown-linux-gnu && \
# Run tidy at the very end, after all the other tests.
python2.7 ../x.py --stage 2 test src/tools/tidy

0 comments on commit a015c21

Please sign in to comment.