a few small cleanups

[rust.git] / tests / fmt.rs

diff --git a/tests/fmt.rs b/tests/fmt.rs
index 4df93cf5a085506e2119cafe53a5289f15e88928..962425d955a79210fc98dc9db3418f151a0cc815 100644 (file)
--- a/tests/fmt.rs
+++ b/tests/fmt.rs
@@ -1,15 +1,30 @@
+use std::path::PathBuf;
+use std::process::Command;
+
 #[test]
-#[ignore]
 fn fmt() {
     if option_env!("RUSTC_TEST_SUITE").is_some() {
         return;
     }
 
-    let root_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    // Skip this test if rustup nightly is unavailable
+    let rustup_output = Command::new("rustup")
+        .args(&["component", "list", "--toolchain", "nightly"])
+        .output()
+        .unwrap();
+    assert!(rustup_output.status.success());
+    let component_output = String::from_utf8_lossy(&rustup_output.stdout);
+    if !component_output.contains("rustfmt") {
+        return;
+    }
+
+    let root_dir = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     let dev_dir = root_dir.join("clippy_dev");
-    let output = std::process::Command::new("cargo")
+    let target_dir = root_dir.join("target");
+    let target_dir = target_dir.to_str().unwrap();
+    let output = Command::new("cargo")
         .current_dir(dev_dir)
-        .args(&["+nightly", "run", "--", "fmt", "--check"])
+        .args(&["+nightly", "run", "--target-dir", target_dir, "--", "fmt", "--check"])
         .output()
         .unwrap();