From 15f9c2dc0683adb07cb05a1bf3d4ef0f98603b04 Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Mon, 1 Aug 2022 21:07:19 -0700
Subject: [PATCH] Fix formats_source test requiring rustfmt.

---
 tests/testsuite/init/formats_source/mod.rs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tests/testsuite/init/formats_source/mod.rs b/tests/testsuite/init/formats_source/mod.rs
index 7d3616200..b8454beea 100644
--- a/tests/testsuite/init/formats_source/mod.rs
+++ b/tests/testsuite/init/formats_source/mod.rs
@@ -1,11 +1,19 @@
 use cargo_test_support::compare::assert_ui;
 use cargo_test_support::prelude::*;
-use cargo_test_support::Project;
+use cargo_test_support::{process, Project};
 
 use cargo_test_support::curr_dir;
 
-#[cargo_test(requires_rustfmt)]
+#[cargo_test]
 fn formats_source() {
+    // This cannot use `requires_rustfmt` because rustfmt is not available in
+    // the rust-lang/rust environment. Additionally, if running cargo without
+    // rustup (but with rustup installed), this test also fails due to HOME
+    // preventing the proxy from choosing a toolchain.
+    if let Err(e) = process("rustfmt").arg("-V").exec_with_output() {
+        eprintln!("skipping test, rustfmt not available:\n{e:?}");
+        return;
+    }
     let project = Project::from_template(curr_dir!().join("in"));
     let project_root = &project.root();