Skip to content

Commit bd9dadf

Browse files
committed
Revert "Fix checktools.sh non-msvc builds"
This reverts commit 2f6307d.
1 parent d21f8a0 commit bd9dadf

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

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

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

src/ci/github-actions/jobs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,8 @@ auto:
382382
python x.py miri --stage 2 library/core --test-args notest &&
383383
python x.py miri --stage 2 library/alloc --test-args notest &&
384384
python x.py miri --stage 2 library/std --test-args notest
385+
386+
HOST_TARGET: x86_64-pc-windows-msvc
385387
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
386388
<<: *job-windows-8c
387389

0 commit comments

Comments
 (0)