handle triple

Author: sylvestre

tests/test_util_name.rs

@@ -51,7 +51,7 @@ fn util_name_double() {
     // input invalid utf8 to cause an error
     child.stdin.take().unwrap().write_all(&[255]).unwrap();
     let output = child.wait_with_output().unwrap();
-println!("output.stderr = {:?}", output.stderr);
+    println!("output.stderr = {:?}", output.stderr);
     assert!(String::from_utf8(output.stderr).unwrap().contains("sort: "));
 }
 

tests/uutests/build.rs

@@ -1,18 +1,37 @@
-use std::env;
 use cargo_metadata::MetadataCommand;
+use std::env;
 
 fn main() {
     // Get the target directory from cargo
     let metadata = MetadataCommand::new().no_deps().exec().unwrap();
     let target_dir = metadata.target_directory;
-    
+
     // Determine the profile (debug or release)
     let profile = env::var("PROFILE").unwrap_or_else(|_| "debug".to_string());
-    
+
+    // Get target and host triples
+    let target_triple = env::var("TARGET").ok();
+    let host_triple = env::var("HOST").ok();
+
     // Construct the path to the coreutils binary
-    let binary_name = if cfg!(windows) { "coreutils.exe" } else { "coreutils" };
-    let binary_path = target_dir.join(profile).join(binary_name);
-    
+    let binary_name = if cfg!(windows) {
+        "coreutils.exe"
+    } else {
+        "coreutils"
+    };
+
+    // Build the binary path based on whether we're cross-compiling
+    let binary_path = if target_triple != host_triple {
+        // For cross compilation: target/<target-triple>/debug/coreutils
+        target_dir
+            .join(target_triple.unwrap())
+            .join(&profile)
+            .join(binary_name)
+    } else {
+        // For native compilation: target/debug/coreutils
+        target_dir.join(&profile).join(binary_name)
+    };
+
     // Output the binary path for use in the tests
     println!("cargo:rustc-env=CARGO_BIN_EXE_coreutils={}", binary_path);
 }

tests/uutests/src/lib/util.rs

@@ -38,9 +38,9 @@ use std::os::unix::process::CommandExt;
 use std::os::unix::process::ExitStatusExt;
 #[cfg(windows)]
 use std::os::windows::fs::{symlink_dir, symlink_file};
-use std::path::{Path, PathBuf};
 #[cfg(windows)]
 use std::path::MAIN_SEPARATOR_STR;
+use std::path::{Path, PathBuf};
 use std::process::{Child, Command, ExitStatus, Output, Stdio};
 use std::rc::Rc;
 use std::sync::mpsc::{self, RecvTimeoutError};
@@ -61,7 +61,7 @@ static NO_STDIN_MEANINGLESS: &str = "Setting this flag has no effect if there is
 static END_OF_TRANSMISSION_SEQUENCE: &[u8] = b"\n\x04";
 
 pub fn get_tests_binary() -> String {
-//env::current_exe().unwrap().into_os_string().into_string().unwrap()
+    //env::current_exe().unwrap().into_os_string().into_string().unwrap()
     env!("CARGO_BIN_EXE_coreutils").to_string()
 }
 // we can't use