development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-24 18:15:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #10092 - ChrisDenton:tmp-match-err, r=alexcrichton

Browse source 
Match any error when failing to find executables

For Windows targets, Rust now uses [a custom resolver](https://github.com/rust-lang/rust/pull/87704) to find `process::Command` programs. This has caused some error messages to change.

To allow the PR to be merged, some tests have been adjusted to match any error.

cc `@ehuss`
This commit is contained in:
bors 2021-11-17 15:16:29 +00:00
parent aed972396c 93bcd97fc1
commit d2d4b06e55
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
tests/testsuite/credential_process.rs
View file

@ -403,13 +403,16 @@ fn libexec_path() {
.masquerade_as_nightly_cargo()
.with_status(101)
.with_stderr(
// FIXME: Update "Caused by" error message once rust/pull/87704 is merged.
// On Windows, changing to a custom executable resolver has changed the
// error messages.
&format!("\
[UPDATING] [..]
[ERROR] failed to execute `[..]libexec/cargo-credential-doesnotexist[EXE]` to store authentication token for registry `crates-io`
Caused by:
{}
", cargo_test_support::no_such_file_err_msg()),
[..]
"),
)
.run();
}

12
tests/testsuite/tool_paths.rs
View file

@ -1,8 +1,6 @@
//! Tests for configuration values that point to programs.
use cargo_test_support::{
basic_lib_manifest, no_such_file_err_msg, project, rustc_host, rustc_host_env,
};
use cargo_test_support::{basic_lib_manifest, project, rustc_host, rustc_host_env};
#[cargo_test]
fn pathless_tools() {
@ -271,6 +269,9 @@ fn custom_runner_env() {
p.cargo("run")
.env(&key, "nonexistent-runner --foo")
.with_status(101)
// FIXME: Update "Caused by" error message once rust/pull/87704 is merged.
// On Windows, changing to a custom executable resolver has changed the
// error messages.
.with_stderr(&format!(
"\
[COMPILING] foo [..]
@ -279,9 +280,8 @@ fn custom_runner_env() {
[ERROR] could not execute process `nonexistent-runner --foo target/debug/foo[EXE]` (never executed)
Caused by:
{}
",
no_such_file_err_msg()
[..]
"
))
.run();
}