uutils · sylvestre · Apr 4, 2025 · Apr 2, 2025
diff --git a/src/testing/commandline/main.rs b/src/testing/commandline/main.rs
@@ -26,6 +26,7 @@ struct Config {
     exit_with: Option<ExitWith>,
     print_stdin: bool,
     no_print_cwd: bool,
+    sort: bool,
     destination_dir: Option<String>,
 }
 
@@ -73,7 +74,7 @@ fn write_content(mut f: impl Write, config: &Config, args: &[String]) {
 }
 
 fn main() {
-    let args = env::args().collect::<Vec<String>>();
+    let mut args = env::args().collect::<Vec<String>>();
     if args.len() < 2 || args[1] == "-h" || args[1] == "--help" {
         usage();
     }
@@ -105,13 +106,20 @@ fn main() {
                 "--print_stdin" => {
                     config.print_stdin = true;
                 }
+                "--sort" => {
+                    config.sort = true;
+                }
                 _ => {
                     usage();
                 }
             }
         }
     }
 
+    if config.sort {
+        args[2..].sort();
+    }
+
     if let Some(destination_dir) = &config.destination_dir {
         write_content(open_file(destination_dir), &config, &args);
     } else {

diff --git a/tests/find_exec_tests.rs b/tests/find_exec_tests.rs
@@ -124,6 +124,7 @@ fn find_exec_multi() {
             "-exec",
             &path_to_testing_commandline(),
             temp_dir_path.as_ref(),
+            "--sort",
             "(",
             "-o",
             "{}",
@@ -145,7 +146,7 @@ fn find_exec_multi() {
     assert_eq!(
         s,
         fix_up_slashes(&format!(
-            "cwd={}\nargs=\n(\n-o\n./test_data/simple/abbbc\n./test_data/simple/subdir/ABBBC\n",
+            "cwd={}\nargs=\n(\n--sort\n-o\n./test_data/simple/abbbc\n./test_data/simple/subdir/ABBBC\n",
             env::current_dir().unwrap().to_string_lossy()
         ))
     );
@@ -165,9 +166,12 @@ fn find_execdir_multi() {
         &[
             "find",
             &fix_up_slashes("./test_data/simple"),
+            "-maxdepth",
+            "1",
             "-execdir",
             &path_to_testing_commandline(),
             temp_dir_path.as_ref(),
+            "--sort",
             ")",
             "{}",
             "+",
@@ -188,7 +192,7 @@ fn find_execdir_multi() {
     assert_eq!(
         s,
         fix_up_slashes(&format!(
-            "cwd={}/test_data\nargs=\n)\n./simple\n",
+            "cwd={}/test_data\nargs=\n)\n--sort\n./simple\n",
             env::current_dir().unwrap().to_string_lossy()
         ))
     );
@@ -199,18 +203,7 @@ fn find_execdir_multi() {
     assert_eq!(
         s,
         fix_up_slashes(&format!(
-            "cwd={}/test_data/simple\nargs=\n)\n./abbbc\n./subdir\n",
-            env::current_dir().unwrap().to_string_lossy()
-        ))
-    );
-    let mut f = File::open(temp_dir.path().join("3.txt")).expect("Failed to open output file");
-    let mut s = String::new();
-    f.read_to_string(&mut s)
-        .expect("failed to read output file");
-    assert_eq!(
-        s,
-        fix_up_slashes(&format!(
-            "cwd={}/test_data/simple/subdir\nargs=\n)\n./ABBBC\n",
+            "cwd={}/test_data/simple\nargs=\n)\n--sort\n./abbbc\n./subdir\n",
             env::current_dir().unwrap().to_string_lossy()
         ))
     );