From 93bcd97fc1e10f4104c79410c124e04725bde68c Mon Sep 17 00:00:00 2001
From: Chris Denton <christophersdenton@gmail.com>
Date: Wed, 17 Nov 2021 11:03:31 +0000
Subject: [PATCH] Match any error when failing to find executables

For Windows targets, Rust now uses a custom resolver to find `process::Command` programs. This has caused some error messages to change.

To allow it to be merged, some tests have been adjusted to match any error.
---
 tests/testsuite/credential_process.rs |  7 +++++--
 tests/testsuite/tool_paths.rs         | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/testsuite/credential_process.rs b/tests/testsuite/credential_process.rs
index 120de2027..fb24533b5 100644
--- a/tests/testsuite/credential_process.rs
+++ b/tests/testsuite/credential_process.rs
@@ -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();
 }
diff --git a/tests/testsuite/tool_paths.rs b/tests/testsuite/tool_paths.rs
index 0cdf5db6a..d8be6b6dc 100644
--- a/tests/testsuite/tool_paths.rs
+++ b/tests/testsuite/tool_paths.rs
@@ -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();
 }