David Tolnay
a4dd463eaf
Keep MiriCommand out of ask_to_run function
2020-04-23 10:27:38 -07:00
David Tolnay
2584507ce2
Preserve consistent output whether or not CI is set
2020-04-23 10:12:48 -07:00
David Tolnay
60fa9acdf7
Disable interactive prompts in CI
2020-04-23 08:51:12 -07:00
Ralf Jung
314e7238cf
avoid a bunch of as_ref/as_mut
2020-04-12 10:32:36 +02:00
Ralf Jung
97791a56da
avoid ref in matches
2020-04-12 10:08:12 +02:00
Ralf Jung
bd9ec746a5
Rust bootstrap sysroot now has src in the same place as rust-src, so remove special hack
2020-04-04 12:07:22 +02:00
Ralf Jung
8ffbca797f
bump xargo version
2020-03-25 12:11:05 +01:00
Ralf Jung
68f70195fa
rename xargo -> xargo_check
2020-03-02 22:10:48 +01:00
Aaron Hill
5960e8b80e
Rename XARGO env var to XARGO_CHECK
...
This reflects the fact that we want bootstrap to override `xargo-check`,
not `xargo
2020-03-02 14:17:14 -05:00
Ralf Jung
48a4e3f4d8
format a few things
2020-03-01 11:54:19 +01:00
Ralf Jung
af98bd9a53
fix trailing indent in xargo files
2020-03-01 11:53:34 +01:00
Ralf Jung
443163f930
refactor cargo-miri a bit
2020-02-24 14:41:04 +01:00
Aaron Hill
e530829797
Use 'cargo check' to build the sysroot and target crate
...
Fixes #1057
Since we are no longer using "cargo rustc", we now use the rustc
arguments passed by Cargo to determine whether we are building a
build dependency, normal dependency, or "target" (final binary or test)
crate.
2020-02-24 14:41:04 +01:00
Ralf Jung
08332bc730
dont overwrite bootstrap flags
2020-02-21 20:06:31 +01:00
bors
02bba3f531
Auto merge of #1124 - RalfJung:sysroot-check, r=oli-obk
...
disable sysroot checks for distributed binaries
This should help with https://github.com/mozilla/nixpkgs-mozilla/issues/198 .
2019-12-23 17:14:48 +00:00
Oliver Scherer
7ead530841
Rustfmt all the things
2019-12-23 12:56:23 +01:00
Ralf Jung
bc715cb646
disable sysroot checks for distributed binaries
2019-12-22 18:13:13 +01:00
Ralf Jung
5339d541ef
cargo-miri: also find Rust sources when being run in a locally built, linked toolchain
2019-11-23 10:33:49 +01:00
Ralf Jung
9ca277f2e9
bump minimal xargo version so that it honors the lockfile
2019-11-08 16:36:57 +01:00
Ralf Jung
ebdb6d4df7
when xargo is manually specified, don't try to upgrade it
2019-10-21 10:25:47 +02:00
Ralf Jung
324fed316f
print sysroot without any escaping
2019-10-19 16:38:37 +02:00
Ralf Jung
2967d0d13a
better error when using cargo-miri in a workspace
2019-10-16 22:03:44 +02:00
Ralf Jung
4ba63fb0fc
explain our shell encoding
2019-10-15 11:03:32 +02:00
bors
42c1e779cb
Auto merge of #980 - JOE1994:master, r=RalfJung
...
change cargo-miri.rs to fix issue #978
In Windows 10, there was an issue with building MIRI locally and getting it running,
due to unpredictable backslash escaping issues in paths.
I added a code snippet that would only be compiled in Windows OS, which replaces all backslashes in paths to slashes.
This fix should only affect Windows users.
Building and testing MIRI locally now works fine after the fix.
![miri_result_after_fix0](https://user-images.githubusercontent.com/10286488/66260998-344abc80-e794-11e9-9d7c-b4ef098443de.PNG )
Fixes https://github.com/rust-lang/miri/issues/978
2019-10-15 08:22:26 +00:00
YOUNGSUK_KIM
65fd00665e
remove unnecessary line break
2019-10-14 22:37:54 -04:00
YOUNGSUK_KIM
e06ce728ca
Ralf Jung's great idea!
2019-10-14 20:57:57 -04:00
Ralf Jung
19fb53e8a3
better debugging for sysroot check
2019-10-12 18:11:44 +02:00
YOUNGSUK_KIM
610dbdd562
fixed cargo-miri bug for windows users
2019-10-10 11:03:20 -04:00
YOUNGSUK_KIM
2b3b865c28
change cargo-miri.rs to fix issue #978
2019-10-05 17:11:09 -04:00
Ralf Jung
8cd215dc97
remove libstd backtrace work-around
2019-09-16 22:22:54 +02:00
bors
9a146243d0
Auto merge of #949 - RalfJung:ask-to-run, r=RalfJung
...
factor ask-to-run-command into helper function
2019-09-14 11:44:01 +00:00
Ralf Jung
78cfdcead2
temporarily enable backtrace feature
2019-09-14 13:06:20 +02:00
Ralf Jung
b245cb616e
factor ask-to-run-command into helper function
2019-09-13 10:39:36 +02:00
Ralf Jung
c6c9276d61
bump Rust and xargo
2019-08-26 19:44:27 +02:00
Ralf Jung
19367fd8de
bump xargo version
2019-08-08 19:34:23 +02:00
Ralf Jung
3fe4eec37a
mention that we get the toolchain right
2019-08-06 20:52:09 +02:00
Ralf Jung
cc8d995605
go back to released xargo (the experiment is done)
2019-08-06 08:05:32 +02:00
Ralf Jung
162c0ffb1f
use postfix negation instead of prefix
2019-08-04 10:14:51 +02:00
Ralf Jung
874437d717
install xargo from git temporarily
2019-08-04 10:11:45 +02:00
Ralf Jung
10f46336af
set RUSTC_DEBUG_ASSERTIONS for when we are in bootstrap
2019-08-03 17:21:30 +02:00
Ralf Jung
ab22da8ce8
annotate some unwraps with better messages
2019-08-03 16:59:30 +02:00
Ralf Jung
e71ca965b9
also let bootstrap tell us where to find xargo
2019-08-03 13:53:32 +02:00
Ralf Jung
0dab3d5ee1
honor CARGO env var (for rustc bootstrap)
2019-08-02 18:02:54 +02:00
Ralf Jung
d213c64d85
let the user skip the sysroot consistency check
2019-07-31 15:15:14 +02:00
Ralf Jung
faadb86159
bump Rust
2019-07-26 22:50:01 +02:00
Ralf Jung
03eff5981b
use org.rust-lang.miri folder on macOS
2019-06-20 19:45:39 +02:00
soc
a561f949ad
Fix project dirs path
...
ProjectDirs::from("miri", "miri", "miri")
would get you `miri\miri` on Windows and `miri.miri.miri` on macOS.
I'm assuming here that your intention was to have only a `miri` directory on every OS.
2019-06-15 17:03:16 +02:00
Ralf Jung
ac2f6cbcde
change sysroot check to print the output in case of an error
2019-06-14 11:16:39 +02:00
Ralf Jung
0a9f9e0a0b
factor out common code to determine miri binary
2019-06-09 19:47:09 +02:00
Ralf Jung
b0b082d4d8
do not handle MIRI_SYSROOT in the driver at all, rely fully on the --sysroot flag
2019-06-09 17:10:04 +02:00