user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix checktools.sh non-msvc builds

Browse source 
(cherry picked from commit 2f6307d1cc)
This commit is contained in:
Chris Denton 2024-09-07 14:58:59 +00:00 • committed by Josh Stone
parent 195a9d53a1
commit f07c6ac2db
2 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh
View file

@ -69,7 +69,10 @@ case $HOST_TARGET in
esac
# Also smoke-test `x.py miri`. This doesn't run any actual tests (that would take too long),
# but it ensures that the crates build properly when tested with Miri.
#FIXME: Re-enable this once CI issues are fixed
#python3 "$X_PY" miri --stage 2 library/core --test-args notest
#python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
#python3 "$X_PY" miri --stage 2 library/std --test-args notest
#FIXME: Re-enable this for msvc once CI issues are fixed
if [ "$HOST_TARGET" != "x86_64-pc-windows-msvc" ]
python3 "$X_PY" miri --stage 2 library/core --test-args notest
python3 "$X_PY" miri --stage 2 library/alloc --test-args notest
python3 "$X_PY" miri --stage 2 library/std --test-args notest
fi

2
src/ci/github-actions/jobs.yml
View file

@ -382,8 +382,6 @@ auto:
python x.py miri --stage 2 library/core --test-args notest &&
python x.py miri --stage 2 library/alloc --test-args notest &&
python x.py miri --stage 2 library/std --test-args notest
HOST_TARGET: x86_64-pc-windows-msvc
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
<<: *job-windows-8c