Skip to content

Remove Hacks and Fixmes from PR CI's LLVM-9 Container #79068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2020
Merged

Remove Hacks and Fixmes from PR CI's LLVM-9 Container #79068

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a015c21
Applied LLVM 9 fixes to LLVM 9 PR CI Dockerfile
DevJPM Nov 15, 2020
b8f682b
Fixed missing / bad header when cross-compiling to i686
DevJPM Nov 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions src/ci/docker/host-x86_64/x86_64-gnu-llvm-9/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ubuntu:18.04

RUN apt-get update && apt-get install -y --no-install-recommends \
g++ \
g++-arm-linux-gnueabi \
gcc-multilib \
make \
ninja-build \
file \
Expand Down 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