Harden Arch PKGBUILD checks by falling back to mkntfs when mkfs.ntfs is absent

src/arch/dualboot/test_utils.rs

@@ -1,6 +1,8 @@
 #[cfg(test)]
 use std::io::Write;
 #[cfg(test)]
+use std::io::{ErrorKind, Result as IoResult};
+#[cfg(test)]
 use std::process::Command;
 #[cfg(test)]
 use tempfile::NamedTempFile;
@@ -69,13 +71,42 @@ impl TestDisk {
 
     /// Format as NTFS
     pub fn format_ntfs(&self) {
-        let status = Command::new("mkfs.ntfs")
-            .arg("-F")
-            .arg("-Q") // Quick format
-            .arg(self.path_str())
-            .status()
-            .expect("Failed to run mkfs.ntfs");
-        assert!(status.success(), "mkfs.ntfs failed");
+        let status = run_ntfs_formatter(self.path_str()).expect("Failed to run NTFS formatter");
+        assert!(status.success(), "NTFS formatter failed");
+    }
+}
+
+#[cfg(test)]
+fn run_ntfs_formatter(path: &str) -> IoResult<std::process::ExitStatus> {
+    let mut not_found = None;
+    for formatter in ["mkfs.ntfs", "mkntfs"] {
+        match Command::new(formatter).arg("-F").arg("-Q").arg(path).status() {
+            Ok(status) => return Ok(status),
+            Err(err) if err.kind() == ErrorKind::NotFound => {
+                not_found = Some(err);
+            }
+            Err(err) => return Err(err),
+        }
+    }
+    Err(
+        not_found.unwrap_or_else(|| {
+            std::io::Error::new(
+                ErrorKind::NotFound,
+                "No NTFS formatter found (tried mkfs.ntfs and mkntfs)",
+            )
+        }),
+    )
+}
+
+#[cfg(test)]
+mod tests {
+    use super::run_ntfs_formatter;
+
+    #[test]
+    fn ntfs_formatter_is_available() {
+        let disk = super::TestDisk::new(16);
+        let status = run_ntfs_formatter(disk.path_str()).expect("No NTFS formatter found");
+        assert!(status.success(), "NTFS formatter failed");
     }
 }