Skip to content

Commit 738e35e

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

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

src/ci/github-actions/jobs.yml

+2
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,8 @@ auto:
446446
python x.py miri --stage 2 library/core --test-args notest &&
447447
python x.py miri --stage 2 library/alloc --test-args notest &&
448448
python x.py miri --stage 2 library/std --test-args notest
449+
450+
HOST_TARGET: x86_64-pc-windows-msvc
449451
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-lld
450452
<<: *job-windows-8c
451453

0 commit comments

Comments
 (0)