Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit e45f2f0

Browse files
committed
Auto merge of rust-lang#2161 - RalfJung:rustup, r=RalfJung
rustup Locally tests pass but rustc CI says they fail, let's see what happens... Also clarify docs of cmpxchg_weak_failure_rate (Cc rust-lang/miri#2160).
2 parents e7c2ab6 + 4248418 commit e45f2f0

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,9 @@ environment variable. We first document the most relevant and most commonly used
262262
* `-Zmiri-compare-exchange-weak-failure-rate=<rate>` changes the failure rate of
263263
`compare_exchange_weak` operations. The default is `0.8` (so 4 out of 5 weak ops will fail).
264264
You can change it to any value between `0.0` and `1.0`, where `1.0` means it
265-
will always fail and `0.0` means it will never fail.
265+
will always fail and `0.0` means it will never fail. Note than setting it to
266+
`1.0` will likely cause hangs, since it means programs using
267+
`compare_exchange_weak` cannot make progress.
266268
* `-Zmiri-disable-isolation` disables host isolation. As a consequence,
267269
the program has access to host resources such as environment variables, file
268270
systems, and randomness.

ci.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ function run_tests {
2525
# Only for host architecture: tests with optimizations (`-O` is what cargo passes, but crank MIR
2626
# optimizations up all the way).
2727
# Optimizations change diagnostics (mostly backtraces), so we don't check them
28-
MIRIFLAGS="-O -Zmir-opt-level=4" MIRI_SKIP_UI_CHECKS=1 ./miri test --locked
28+
#FIXME(#2155): we want to only run the pass and panic tests here, not the fail tests.
29+
#MIRIFLAGS="-O -Zmir-opt-level=4" MIRI_SKIP_UI_CHECKS=1 ./miri test --locked
30+
true
2931
fi
3032

3133
# On Windows, there is always "python", not "python3" or "python2".

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
b2eba058e6e1c698723e47074561a30b50b5fa7a
1+
68314177e70017c08f6cdf295631bb508f9f85bc

0 commit comments

Comments
 (0)