Merge pull request #394 from sylvestre/uutests

use uutests

Author: sylvestre

Cargo.lock

@@ -65,6 +65,8 @@ tempfile = "3.10.1"
 textwrap = { version = "0.16.1", features = ["terminal_size"] }
 thiserror = "2.0.4"
 uucore = "0.0.30"
+uutests = "0.0.30"
+ctor = "0.4.1"
 walkdir = "2.5.0"
 windows = { version = "0.61.1" }
 windows-sys = { version = "0.59.0", default-features = false }
@@ -105,6 +107,8 @@ pretty_assertions = "1.4.0"
 rand = { workspace = true }
 regex = { workspace = true }
 tempfile = { workspace = true }
+ctor = { workspace = true }
+uutests = { workspace = true }
 uucore = { workspace = true, features = ["entries", "process", "signals"] }
 
 [target.'cfg(unix)'.dev-dependencies]

Cargo.toml

@@ -6,7 +6,9 @@
 use pretty_assertions::assert_eq;
 use regex::Regex;
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 // TODO: make tests combineable (e.g. test --total --human)
 

tests/by-util/test_free.rs

@@ -9,9 +9,11 @@ use std::{
     process::{Child, Command},
 };
 
-use crate::common::util::TestScenario;
 #[cfg(target_os = "linux")]
 use regex::Regex;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[cfg(target_os = "linux")]
 const SINGLE_PID: &str = "^[1-9][0-9]*";

tests/by-util/test_pgrep.rs

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_no_args() {

tests/by-util/test_pidof.rs

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_invalid_arg() {

tests/by-util/test_pidwait.rs

@@ -4,7 +4,11 @@
 // file that was distributed with this source code.
 
 #[cfg(unix)]
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+#[cfg(unix)]
+use uutests::util::TestScenario;
+#[cfg(unix)]
+use uutests::util_name;
 
 #[cfg(unix)]
 #[test]

tests/by-util/test_pkill.rs

@@ -3,11 +3,13 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
 #[cfg(target_os = "linux")]
 use regex::Regex;
 #[cfg(target_os = "linux")]
 use std::process;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 const NON_EXISTING_PID: &str = "999999";
 #[cfg(target_os = "linux")]

tests/by-util/test_pmap.rs

@@ -3,7 +3,9 @@
 // For the full copyright and license information, please view the LICENSE
 // file that was distributed with this source code.
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 #[cfg(target_os = "linux")]

tests/by-util/test_ps.rs

@@ -7,7 +7,9 @@ use std::process;
 
 use regex::Regex;
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_no_args() {