Commit Graph

5579 Commits

Author SHA1 Message Date
bors
36176cde68 Auto merge of #1778 - RalfJung:thread-local-const-init, r=RalfJung
test thread_local_const_init

Blocked on https://github.com/rust-lang/rust/pull/84291
2021-04-20 08:01:46 +00:00
Ralf Jung
2ae699c56d make TLS-drop-test more cross-platform 2021-04-20 09:59:26 +02:00
bors
74ffda2dd7 Auto merge of #1779 - RalfJung:cargo-miri-xargo, r=RalfJung
fix MIRI_BE_RUSTC value during sysroot build

`@hyd-dev` pointed out that `MIRI_BE_RUSTC` is set to an incorrect value during the xargo sysroot build. This fixes that.
2021-04-20 07:41:41 +00:00
Ralf Jung
f73cc11f3f rustup 2021-04-20 09:40:18 +02:00
Ralf Jung
6834944fd3 fix MIRI_BE_RUSTC value during sysroot build 2021-04-18 12:29:31 +02:00
Ralf Jung
d512ba2ae2 test thread_local_const_init 2021-04-18 11:01:08 +02:00
bors
a86eab3e6c Auto merge of #1777 - crlf0710:fix_compilation, r=RalfJung
Remove `main_fn.rs` test.

Fixes build error caused by https://github.com/rust-lang/rust/issues/84240 .
2021-04-16 16:46:05 +00:00
Charles Lew
85f7dd6131 Remove main_fn.rs test. 2021-04-17 00:04:09 +08:00
bors
b13b79db73 Auto merge of #1775 - ABouttefeux:master, r=RalfJung
Fix failing test after merge of PR rust#83948

Cc https://github.com/rust-lang/rust/issues/84202
2021-04-15 08:19:18 +00:00
Aliénore Bouttefeux
64d07ea217 change rust version to head 2021-04-15 10:17:54 +02:00
Aliénore Bouttefeux
648638976a allow deref of null ptr in test 2021-04-15 10:00:39 +02:00
bors
f76e256086 Auto merge of #1774 - RalfJung:contrib, r=RalfJung
fix CONTRIBUTING example

Fixes https://github.com/rust-lang/miri/issues/1773
2021-04-12 17:01:45 +00:00
Ralf Jung
67b8844628 fix CONTRIBUTING example 2021-04-12 19:01:10 +02:00
bors
e6ffc689aa Auto merge of #1772 - RalfJung:less-timeout-checking, r=RalfJung
only check timeouts when a thread yields

Currently, we check for expired timeouts after each step of execution. That seems excessive. This changes the scheduler to only check for timeouts when the active thread cannot continue running any more.

`@vakaras` does this sound right? `pthread_cond_timedwait` anyway already yields, of course, since it blocks on getting the signal (or the timeout).
2021-04-11 14:59:27 +00:00
Ralf Jung
0674d439b6 test calling pthread_cond_timedwait with an already elapsed timeout 2021-04-11 14:21:42 +02:00
bors
afabaf30d7 Auto merge of #1771 - vakaras:bug-1763, r=RalfJung
Attempt to fix #1763

As discussed on issue #1763, just try asking the scheduler to try again.

Fixes https://github.com/rust-lang/miri/issues/1763
2021-04-11 11:49:27 +00:00
Vytautas Astrauskas
50f68dce21 Reference issue 1763 in the comment. 2021-04-11 13:39:03 +02:00
Ralf Jung
bda328e26a only check timeouts when a thread yields 2021-04-11 13:32:47 +02:00
Vytautas Astrauskas
72ca2a7a85 Attempt to fix #1763 by asking the scheduler to retry choosing an operation. 2021-04-10 20:23:32 +02:00
bors
1ae7bfc6c6 Auto merge of #1770 - RalfJung:no_run, r=RalfJung
make sure that we truly do not run no_run doctests
2021-04-10 13:11:05 +00:00
Ralf Jung
2decc78db9 make sure that we truly do not run no_run doctests 2021-04-10 14:20:06 +02:00
Ralf Jung
eaba4b2d2a remove compatibility code for passing miri flags via cargo arguments 2021-04-10 14:07:46 +02:00
bors
ccbef9c69f Auto merge of #1768 - RalfJung:readme, r=RalfJung
add the bad doctests we found to the trophy case
2021-04-10 10:35:21 +00:00
Ralf Jung
87882f2c6a add the bad doctests we found to the trophy case 2021-04-10 12:33:18 +02:00
bors
7c66eaf9f1 Auto merge of #1766 - RalfJung:dropped-temporary, r=RalfJung
add test to detect dropped temporary

Let's make sure we catch this kind of error.
2021-04-10 10:10:27 +00:00
Ralf Jung
21968aa53b add test to detect dropped temporary 2021-04-10 12:09:10 +02:00
bors
d0a4b5d5cc Auto merge of #1765 - rust-lang:rustup, r=RalfJung
rustup

Looks like we haven't had one of these in a bit.
2021-04-10 09:03:11 +00:00
Ralf Jung
aa3bc06f0f rustup 2021-04-10 11:00:41 +02:00
bors
b9b2af9729 Auto merge of #1764 - RalfJung:readme, r=RalfJung
fix typo in README

"you program" → "your program"
2021-04-09 09:29:48 +00:00
Ralf Jung
0a7a41f6ad fix typo in README 2021-04-09 11:24:33 +02:00
bors
1ec52abb48 Auto merge of #1761 - hyd-dev:build-rs-proc-macro-no-default-args, r=RalfJung
Don't use `MIRI_DEFAULT_ARGS` to compile host crates

They (specifically, `--cfg=miri`) may cause procedural macros (and probably build scripts) to depend on Miri-only symbols, such as `miri_resolve_frame`.

This PR makes `miri` detect host crates inspecting the value of the `MIRI_BE_RUSTC` environment variable (`target` -> target crate, `host` -> host crate, other -> panic) and skip the insertion of `MIRI_DEFAULT_ARGS` if it's a host crate.

Fixes #1760
2021-04-08 17:07:15 +00:00
hyd-dev
3dff1d4fcd
Don't use MIRI_DEFAULT_ARGS to compile host crates 2021-04-09 00:57:59 +08:00
bors
7b2e325728 Auto merge of #1759 - RalfJung:readme, r=RalfJung
mention 'cargo miri test filter' in README

Also update the "unsupported" example to something that is actually unsupported.
2021-04-07 08:10:37 +00:00
Ralf Jung
a760aab828 mention 'cargo miri test filter' in README 2021-04-07 10:09:42 +02:00
bors
685ad70647 Auto merge of #1757 - RalfJung:rustdoc, r=RalfJung
add rustdoc support

`@teryror` did all the work in https://github.com/rust-lang/miri/pull/1671; I just finished things up and fixed conflicts. Also thanks to `@hyd-dev` for preemptively fixing a sysroot issue that would have taken me some time to diagnose.

Fixes https://github.com/rust-lang/miri/issues/584
2021-04-06 08:41:11 +00:00
Ralf Jung
2f6dff6da8 nits and fix non-deterministic test output 2021-04-05 13:18:59 +02:00
Ralf Jung
f9bd6b0756 nits; test running no doctests 2021-04-05 12:46:36 +02:00
Ralf Jung
e66a89c8af avoid some dead code and test no_run tests 2021-04-05 12:37:22 +02:00
Ralf Jung
29bc8a57b0 add test for compile_fail; de-duplicate sysroot forwarding 2021-04-05 12:16:31 +02:00
hyd-dev
65597951b7 Fix sysroot for rustdoc 2021-04-05 11:56:13 +02:00
Ralf Jung
9083e00b2c resolve semantic conflicts 2021-04-05 11:55:53 +02:00
Ralf Jung
dd393f21c7 make attempt to cross-interpret a hard error 2021-04-05 11:48:37 +02:00
Tristan Dannenberg
4fccde54ac make cargo-miri run doc-tests 2021-04-05 11:48:17 +02:00
bors
28f813f4d3 Auto merge of #1756 - RalfJung:getrandom, r=RalfJung
also test old getrandom

getrandom 0.1 is still in use, so let's make sure it also still works with Miri.
2021-04-04 13:36:30 +00:00
Ralf Jung
84f44900f4 also test old getrandom 2021-04-04 15:35:19 +02:00
bors
9c41b8b1cb Auto merge of #1755 - RalfJung:cargo-update, r=RalfJung
'cargo update' all the things

Also add a test directly calling `getrandom`.
2021-04-04 10:06:58 +00:00
Ralf Jung
3d15e47441 bump test-cargo-miri dependencies 2021-04-04 12:03:52 +02:00
Ralf Jung
8e661cc47e bump cargo-miri dependencies 2021-04-04 12:01:32 +02:00
Ralf Jung
31bd77c7d8 bump miri dependencies 2021-04-04 11:48:20 +02:00
Ralf Jung
20e31dbdad fix newer getrandom on Windows 2021-04-04 11:41:04 +02:00