Merge branch 'sylvestre-main'

Author: sylvestre

.vscode/cspell.dictionaries/workspace.wordlist.txt

@@ -325,13 +325,15 @@ libc
 libstdbuf
 musl
 tmpd
+uchild
 ucmd
 ucommand
 utmpx
 uucore
 uucore_procs
 uudoc
 uumain
+uutests
 uutil
 uutils
 

CONTRIBUTING.md

@@ -31,11 +31,13 @@ parts for getting started:
 
 - [`src/uu`](./src/uu/): The code for all utilities
 - [`src/uucore`](./src/uucore/): Crate containing all the shared code between
-  the utilities.
+  the utilities. This crate is also used outside of the Coreutils.
 - [`tests/by-util`](./tests/by-util/): The tests for all utilities.
 - [`src/bin/coreutils.rs`](./src/bin/coreutils.rs): Code for the multicall
   binary.
 - [`docs`](./docs/src): the documentation for the website
+- [`tests/uutests/`](./tests/uutests/): Crate implementing
+  the various functions to test uutils commands.
 
 Each utility is defined as a separate crate. The structure of each of these
 crates is as follows:
@@ -62,6 +64,8 @@ We have the following goals with our development:
 - **Reliable**: The utilities should never unexpectedly fail.
 - **Performant**: Our utilities should be written in fast idiomatic Rust. We aim
   to match or exceed the performance of the GNU utilities.
+  [hyperfine](https://github.com/sharkdp/hyperfine) is the recommended tool for
+  this task.
 - **Well-tested**: We should have a lot of tests to be able to guarantee
   reliability and compatibility.
 

Cargo.lock

@@ -263,6 +263,10 @@ feat_os_windows_legacy = [
 # * bypass/override ~ translate 'test' feature name to avoid dependency collision with rust core 'test' crate (o/w surfaces as compiler errors during testing)
 test = ["uu_test"]
 
+[workspace]
+members = ["tests/uutests"]
+default-members = ["."]
+
 [workspace.package]
 readme = "README.package.md"
 
@@ -366,6 +370,7 @@ uucore = { version = "0.0.30", package = "uucore", path = "src/uucore" }
 uucore_procs = { version = "0.0.30", package = "uucore_procs", path = "src/uucore_procs" }
 uu_ls = { version = "0.0.30", path = "src/uu/ls" }
 uu_base32 = { version = "0.0.30", path = "src/uu/base32" }
+uutests = { version = "0.0.30", package = "uutests", path = "tests/uutests/" }
 
 [dependencies]
 clap = { workspace = true }
@@ -493,6 +498,7 @@ yes = { optional = true, version = "0.0.30", package = "uu_yes", path = "src/uu/
 #pin_cc = { version="1.0.61, < 1.0.62", package="cc" } ## cc v1.0.62 has compiler errors for MinRustV v1.32.0, requires 1.34 (for `std::str::split_ascii_whitespace()`)
 
 [dev-dependencies]
+uutests = { workspace = true }
 chrono = { workspace = true }
 filetime = { workspace = true }
 glob = { workspace = true }
@@ -505,6 +511,7 @@ sha1 = { workspace = true, features = ["std"] }
 tempfile = { workspace = true }
 time = { workspace = true, features = ["local-offset"] }
 unindent = "0.2.3"
+#uutests = { workspace = true }
 uucore = { workspace = true, features = [
   "mode",
   "entries",
@@ -516,17 +523,17 @@ walkdir = { workspace = true }
 hex-literal = "0.4.1"
 rstest = { workspace = true }
 
-[target.'cfg(any(target_os = "linux", target_os = "android"))'.dev-dependencies]
+[target.'cfg(any(target_os = "linux", target_os = "android"))'.dependencies]
 procfs = { version = "0.17", default-features = false }
 
-[target.'cfg(unix)'.dev-dependencies]
+[target.'cfg(unix)'.dependencies]
 nix = { workspace = true, features = ["process", "signal", "user", "term"] }
 rlimit = "0.10.1"
 xattr = { workspace = true }
 
 # Specifically used in test_uptime::test_uptime_with_file_containing_valid_boot_time_utmpx_record
 # to deserialize a utmpx struct into a binary file
-[target.'cfg(all(target_family= "unix",not(target_os = "macos")))'.dev-dependencies]
+[target.'cfg(all(target_family= "unix",not(target_os = "macos")))'.dependencies]
 serde = { version = "1.0.202", features = ["derive"] }
 bincode = { version = "1.3.3" }
 serde-big-array = "0.5.1"

Cargo.toml

@@ -2,7 +2,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_arch() {

tests/by-util/test_arch.rs

@@ -4,7 +4,9 @@
 // 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_encode() {

tests/by-util/test_base32.rs

@@ -2,7 +2,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_encode() {

tests/by-util/test_base64.rs

@@ -4,9 +4,11 @@
 // file that was distributed with this source code.
 // spell-checker:ignore (words) reallylongexecutable nbaz
 
-use crate::common::util::TestScenario;
 #[cfg(any(unix, target_os = "redox"))]
 use std::ffi::OsStr;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_help() {

tests/by-util/test_basename.rs

@@ -5,7 +5,9 @@
 
 // spell-checker: ignore (encodings) lsbf msbf
 
-use crate::common::util::TestScenario;
+use uutests::new_ucmd;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_z85_not_padded_decode() {

tests/by-util/test_basenc.rs

@@ -4,16 +4,18 @@
 // file that was distributed with this source code.
 // spell-checker:ignore NOFILE nonewline cmdline
 
-#[cfg(not(windows))]
-use crate::common::util::vec_of_size;
-use crate::common::util::TestScenario;
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use rlimit::Resource;
-#[cfg(target_os = "linux")]
+#[cfg(unix)]
 use std::fs::File;
 use std::fs::OpenOptions;
-#[cfg(not(windows))]
 use std::process::Stdio;
+use uutests::at_and_ucmd;
+use uutests::new_ucmd;
+#[cfg(not(windows))]
+use uutests::util::vec_of_size;
+use uutests::util::TestScenario;
+use uutests::util_name;
 
 #[test]
 fn test_output_simple() {
@@ -666,3 +668,40 @@ fn test_appending_same_input_output() {
         .no_stdout()
         .stderr_contains("input file is output file");
 }
+
+#[cfg(unix)]
+#[test]
+fn test_uchild_when_no_capture_reading_from_infinite_source() {
+    use regex::Regex;
+
+    let ts = TestScenario::new("cat");
+
+    let expected_stdout = b"\0".repeat(12345);
+    let mut child = ts
+        .ucmd()
+        .set_stdin(Stdio::from(File::open("/dev/zero").unwrap()))
+        .set_stdout(Stdio::piped())
+        .run_no_wait();
+
+    child
+        .make_assertion()
+        .with_exact_output(12345, 0)
+        .stdout_only_bytes(expected_stdout);
+
+    child
+        .kill()
+        .make_assertion()
+        .with_current_output()
+        .stdout_matches(&Regex::new("[\0].*").unwrap())
+        .no_stderr();
+}
+
+#[test]
+fn test_child_when_pipe_in() {
+    let ts = TestScenario::new("cat");
+    let mut child = ts.ucmd().set_stdin(Stdio::piped()).run_no_wait();
+    child.pipe_in("content");
+    child.wait().unwrap().stdout_only("content").success();
+
+    ts.ucmd().pipe_in("content").run().stdout_is("content");
+}