Commit Graph

6978 Commits

Author SHA1 Message Date
Ralf Jung
87b9075920 avoid double-space in test logging 2022-08-02 18:27:06 -04:00
Ralf Jung
8356f4cc23 output realpath as a path, and remove a bogus test 2022-08-02 18:08:43 -04:00
Christian Legnitto
b43bede938 Add shim for realpath on unix 2022-08-02 17:27:11 -04:00
bors
7865255b86 Auto merge of #2453 - RalfJung:rustup, r=RalfJung
rustup

Should work again, now that https://github.com/rust-lang/rust/pull/99984 landed.
2022-08-01 13:28:17 +00:00
Ralf Jung
9ffea913b8 clippy 2022-08-01 09:27:56 -04:00
Ralf Jung
f6badf037e rustup 2022-08-01 09:27:34 -04:00
bors
8aab6bb164 Auto merge of #2452 - Hiroki6:eval-rs-comments-typo, r=RalfJung
Fix typo in eval.rs

I just found some typos while reading the code
2022-07-31 16:04:51 +00:00
Hiroki6
66f6fa68fa Fix typo in eval.rs 2022-07-31 16:15:11 +02:00
bors
44dc49febe Auto merge of #2450 - avrong:cargo-metadata, r=oli-obk
Use cargo_metadata in cargo-miri

Closes #2393

Added `cargo_metadata` to `cargo-miri` and changed metadata from manual parsing to `cargo_metadata` invocations. Thus, removed local `Metadata` struct too.

Happy to fix if anything isn't right :)
2022-07-29 12:51:14 +00:00
Aleksei Trifonov
01a6109925 Fix formatting 2022-07-29 14:42:42 +03:00
Aleksei Trifonov
38e7bcf7f1 Use cargo_metadata in cargo-miri 2022-07-29 05:25:59 +03:00
bors
a719c05816 Auto merge of #2426 - saethlin:unix-exec, r=RalfJung
Use real exec on cfg(unix) targets

Closes https://github.com/rust-lang/miri/issues/2421

The standard library has a platform extension trait that lets us get the behavior we want on cfg(unix), so why not use it?

I tried this out and it produces the correct behavior in concert with nextest.
2022-07-28 22:05:42 +00:00
Ben Kimock
622613f957 Use real exec on cfg(unix) targets
When cargo-miri is executed as a cargo test runner or rustdoc runtool,
external tools expect what they launch as the runner/runtool to be the
process actually running the test. But in the implementation, we launch
the Miri interpreter as a subprocess using std::process::Command. This
tends to confuse other tools (like nextest) and users (like the author).
What we really want is to call POSIX exec so that the cargo-miri process
becomes the interpreter.

So this implements just that; we call execve via a cfg(unix) extension
trait. Windows has no such mechanism, but it also doesn't have POSIX
signals, which is the primary tripping hazard this change fixes.
2022-07-26 23:34:20 -04:00
bors
530abacbf7 Auto merge of #2447 - RalfJung:rustup, r=RalfJung
rustup
2022-07-27 00:39:00 +00:00
Ralf Jung
dd3b8e8b1b rustup 2022-07-26 20:38:25 -04:00
bors
a62f954eeb Auto merge of #2444 - oli-obk:file_descriptor_defaults, r=RalfJung
Add default impls for `FileDescriptor` methods

I felt like it was just noisy to have to write the "can't do this here" defaults
2022-07-26 23:35:05 +00:00
bors
c0cbddc78a Auto merge of #2446 - RalfJung:rustup, r=RalfJung
add test for dyn call issue

Tests for https://github.com/rust-lang/miri/issues/2432
2022-07-26 02:41:55 +00:00
Ralf Jung
5875c0d220 add test for dyn call issue 2022-07-25 22:41:12 -04:00
Oli Scherer
cd6b723bb6 Add default impls for FileDescriptor methods 2022-07-25 17:57:56 +00:00
bors
b938529fb8 Auto merge of #2438 - RalfJung:more-track-caller, r=RalfJung
adjust for more backtrace pruning

The Miri side of https://github.com/rust-lang/rust/pull/99690. Those messages are much nicer. :) And we also need error-pattern much less.
2022-07-25 14:38:57 +00:00
Ralf Jung
39d8c4de35 rustup 2022-07-25 10:38:22 -04:00
Ralf Jung
b514667c36 adjust for more backtrace pruning 2022-07-25 10:24:19 -04:00
bors
6227e1e3a8 Auto merge of #2422 - RalfJung:integers, r=oli-obk
enable clippy lints against integer casts

Cc https://github.com/rust-lang/miri/issues/1236
2022-07-25 11:46:55 +00:00
bors
3d237be15c Auto merge of #2436 - RalfJung:lib-crates, r=oli-obk
fix build.rs invoking RUSTC to do check builds

This makes the Miri driver, when invokved via the RUSTC env var from inside a build script, behave almost entirely like rustc. I had to redo how we propagate sysroot information for this (which is actually back to how we used to do sysroot propagation many years ago).

Fixes https://github.com/rust-lang/miri/issues/2431
2022-07-25 10:39:02 +00:00
bors
30d1c68206 Auto merge of #2434 - RalfJung:ui-test-locked, r=oli-obk
ui_test: build dependencies in locked mode unless bless is enabled

This should help ensure that tests are reproducible.
2022-07-25 09:32:40 +00:00
bors
a591e9fc5b Auto merge of #2440 - RalfJung:up, r=RalfJung
rustup
2022-07-24 21:56:00 +00:00
Ralf Jung
cbff63a694 rustup 2022-07-24 17:51:39 -04:00
bors
fff47429d9 Auto merge of #2439 - RalfJung:ptr-offset-from-unsigned, r=RalfJung
more tests for ptr_offset_from_unsinged
2022-07-24 19:24:55 +00:00
Ralf Jung
8f3b594d1e more tests for ptr_offset_from_unsinged 2022-07-24 15:23:39 -04:00
Ralf Jung
9406b6da68 fmt 2022-07-24 13:58:14 -04:00
Ralf Jung
0b1d5a4957 test all of the autocfg queries 2022-07-24 13:35:05 -04:00
Ralf Jung
d905901d65 make miri a better RUSTC by default inside cargo-miri
this requires a change in sysroot handling: miri driver now requires
MIRI_SYSROOT to be set when it is in 'target' mode, rather than relying on
`--sysroot` always being present.
2022-07-24 13:30:32 -04:00
bors
a5f0a9b7ed Auto merge of #2435 - RalfJung:rustup, r=RalfJung
Rustup
2022-07-24 13:26:38 +00:00
Ralf Jung
3ee56989c7 get rid of some uses of core_intrinsics 2022-07-24 09:26:11 -04:00
Ralf Jung
c33fc24566 rustup 2022-07-24 08:37:29 -04:00
Ralf Jung
5c52a7695c ui_test: build dependencies in locked mode unless bless is enabled 2022-07-24 07:37:10 -04:00
bors
8fdb720329 Auto merge of #2430 - RalfJung:no-global-wrapper, r=RalfJung
attempt to overwrite globally set build.rustc-wrapper

Hopefully fixes https://github.com/rust-lang/miri/issues/2429
2022-07-24 00:35:28 +00:00
Ralf Jung
7267e0d4c5 attempt to test RUSTC and RUSTC_WRAPPER shenanigans on CI 2022-07-23 20:23:38 -04:00
bors
17bb2c0946 Auto merge of #2428 - RalfJung:cargo-miri-runner, r=RalfJung
cargo-miri: use '--config target.runner' rather than the TARGET_RUNNER env vars

That means we can properly escape spaces in our filename. This should fix https://github.com/rust-lang/miri/issues/2417, hopefully for real this time. We can also specify a "leading command" which makes it much easier to disambiguate runner invocations from rustdoc invocations!

Thanks to `@ehuss` for suggesting this.
2022-07-24 00:06:12 +00:00
Ralf Jung
25b11f6424 attempt to overwrite globally set build.rustc-wrapper 2022-07-23 19:22:02 -04:00
bors
62efc6201b Auto merge of #2427 - Nilstrieb:doc-fix, r=saethlin
Fix outdated docs in sb stack cache

Since `Item` is bitpacked now, the full `Item` is stored in the cache.
2022-07-23 23:21:26 +00:00
Nilstrieb
8b643809cc Fix outdated docs in sb stack cache
Since `Item` is bitpacked now, the full `Item` is stored in the cache.
2022-07-24 00:35:02 +02:00
Ralf Jung
b93fcd99e8 avoid spurious 'Preparing a sysroot for Miri...' in 'cargo miri setup --print-sysroot'
also clean up sysroot building printing logic a bit
2022-07-23 18:04:06 -04:00
Ralf Jung
e14df05370 set runner for all targets via 'all()' 2022-07-23 17:46:02 -04:00
Ralf Jung
dd01870657 cargo-miri: use '--config target.runner' rather than the TARGET_RUNNER env vars 2022-07-23 17:36:42 -04:00
bors
b2418e82d3 Auto merge of #2425 - RalfJung:hide-xargo, r=RalfJung
don't dump xargo output onto users of 'cargo miri test'

The xargo invocation prints a lot of details users probably won't care about, so let's hide them (unless the user did `cargo miri setup`, then we still print everything).
2022-07-23 18:35:59 +00:00
Ralf Jung
0c5392f435 now test-cargo-miri will actually work even without a hot cache :D 2022-07-23 14:35:17 -04:00
Ralf Jung
6c0398da7d don't dump xargo output onto users of 'cargo miri test' 2022-07-23 12:47:26 -04:00
Ralf Jung
b08e51d79a refactor away some 'else { None }' 2022-07-23 12:30:48 -04:00
bors
302e9ae206 Auto merge of #2424 - RalfJung:weak-memory-debug, r=RalfJung
add a flag to print a diagnostic when an outdated value is returned from an atomic load

Helps with https://github.com/rust-lang/miri/issues/2313. It can still be annoying to figure out *which* outdated load is the important one in case there are many of them (and the issue contains some ideas for how to help with that situation), but having this flag is better than nothing.

Thanks to `@cbeuw` for the [original patch](64d738cb00) that I based this on.
2022-07-23 13:40:23 +00:00