This commit is contained in:
Ralf Jung 2022-08-01 09:13:34 -04:00
parent 8aab6bb164
commit f6badf037e
3 changed files with 4 additions and 4 deletions

View File

@ -548,14 +548,14 @@ path = "lib.rs"
// Manage the output the user sees.
if only_setup {
// We want to be explicit.
eprintln!("Preparing a sysroot for Miri...");
eprintln!("Preparing a sysroot for Miri (target: {target})...");
if print_sysroot {
// Be extra sure there is no noise on stdout.
command.stdout(process::Stdio::null());
}
} else {
// We want to be quiet, but still let the user know that something is happening.
eprint!("Preparing a sysroot for Miri... ");
eprint!("Preparing a sysroot for Miri (target: {target})... ");
command.stdout(process::Stdio::null());
command.stderr(process::Stdio::null());
}

View File

@ -1 +1 @@
c11207ec89b856164bba03b8ecfe07b0b234ed21
1f5d8d49eb6111931091f700d07518cd2b80bc18

View File

@ -29,7 +29,7 @@ def normalize_stdout(str):
return str
def normalize_stderr(str):
str = str.replace("Preparing a sysroot for Miri... done\n", "") # remove leading cargo-miri setup output
str = re.sub("Preparing a sysroot for Miri \(target: [a-z0-9_-]+\)\.\.\. done\n", "", str) # remove leading cargo-miri setup output
return str
def check_output(actual, path, name):