move files from src/bin -> src/uu

t# This is a combination of 3 commits.
move files from src/bin -> src/uu/<sub directory>

Author: HaitaiNg

.github/workflows/ci.yml

@@ -124,18 +124,4 @@ jobs:
         ## flags: IntegrationTests, UnitTests, ${{ steps.vars.outputs.CODECOV_FLAGS }}
         flags: ${{ steps.vars.outputs.CODECOV_FLAGS }}
         name: codecov-umbrella
-        fail_ci_if_error: false
-
-  wrapper-tests:
-    name: wrapper binaries integration tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macOS-latest, windows-latest]
-    steps:
-      - uses: actions/checkout@v6
-      - uses: dtolnay/rust-toolchain@stable
-      - name: Run wrapper binary tests
-        run: |
-          # Run only the wrapper integration tests to validate wrapper behavior
-          cargo test --test test_wrapper_binaries -- --nocapture
+        fail_ci_if_error: false

Cargo.lock

@@ -75,7 +75,6 @@ rand = { workspace = true }
 uutests = { workspace = true }
 ctor = { workspace = true }
 uucore = { workspace = true, features = ["entries", "process", "signals"] }
-assert_cmd = "2.0"
 
 [target.'cfg(unix)'.dev-dependencies]
 xattr = { workspace = true }

Cargo.toml

@@ -0,0 +1,65 @@
+use assert_cmd::Command;
+use predicates::prelude::*;
+
+/// Assert that `--help` succeeds and prints either the binary name or Usage text
+fn assert_help(bin: &str) {
+    Command::cargo_bin(bin)
+        .unwrap()
+        .arg("--help")
+        .assert()
+        .success()
+        .stdout(
+            predicate::str::contains(bin)
+                .or(predicate::str::contains("Usage")),
+        );
+}
+
+/// Assert that `--version` succeeds and prints the binary name
+fn assert_version(bin: &str) {
+    Command::cargo_bin(bin)
+        .unwrap()
+        .arg("--version")
+        .assert()
+        .success()
+        .stdout(predicate::str::contains(bin));
+}
+
+#[test]
+fn dnsdomainname_help() {
+    assert_help("dnsdomainname");
+}
+
+#[test]
+fn domainname_help() {
+    assert_help("domainname");
+}
+
+#[test]
+fn nisdomainname_help() {
+    assert_help("nisdomainname");
+}
+
+#[test]
+fn ypdomainname_help() {
+    assert_help("ypdomainname");
+}
+
+#[test]
+fn dnsdomainname_version() {
+    assert_version("dnsdomainname");
+}
+
+#[test]
+fn domainname_version() {
+    assert_version("domainname");
+}
+
+#[test]
+fn nisdomainname_version() {
+    assert_version("nisdomainname");
+}
+
+#[test]
+fn ypdomainname_version() {
+    assert_version("ypdomainname");
+}

src/bin/dnsdomainname.rs src/uu/dnsdomainname/src/main.rssrc/bin/dnsdomainname.rs renamed to src/uu/dnsdomainname/src/main.rs

@@ -0,0 +1,31 @@
+use uutests::new_ucmd;
+
+pub const TESTS_BINARY: &str = env!("CARGO_BIN_EXE_hostname");
+
+// Use the ctor attribute to run this function before any tests
+#[ctor::ctor]
+fn init() {
+    unsafe {
+        // Necessary for uutests to be able to find the binary
+        std::env::set_var("UUTESTS_BINARY_PATH", TESTS_BINARY);
+    }
+}
+
+
+#[test]
+fn test_invalid_arg() {
+    init();
+    new_ucmd!().arg("--definitely-invalid").fails().code_is(1);
+}
+
+#[test]
+fn test_help_flag() {
+    init();
+    new_ucmd!().arg("--help").succeeds();
+}
+
+#[test]
+fn test_version_flag() {
+    init();
+    new_ucmd!().arg("--version").succeeds();
+}