Cleanups

dev/src/nm.rs

@@ -37,7 +37,7 @@ enum OutputType {
 #[command(author, version, about, long_about)]
 struct Args {
     /// Write the full pathname or library name of an object on each line.
-    #[arg(short = 'A', long)]
+    #[arg(short = 'A', long = "print-file-name")]
     print_name: bool,
 
     /// Write only external (global) and static symbol information.
@@ -49,7 +49,7 @@ struct Args {
     full: bool,
 
     /// Write only external (global) symbol information.
-    #[arg(short, long)]
+    #[arg(short, long = "extern-only")]
     global: bool,
 
     /// Write numeric values in octal (equivalent to -t o).
@@ -61,15 +61,15 @@ struct Args {
     hex: bool,
 
     /// Write information in a portable output format
-    #[arg(short = 'P', long)]
+    #[arg(short = 'P', long = "portability")]
     portable: bool,
 
     /// Write each numeric value in the specified format.
     #[arg(short = 't', long = "format", value_enum, default_value = "d")]
     out_type: OutputType,
 
     /// Write only undefined symbols.
-    #[arg(short, long)]
+    #[arg(short, long = "undefined-only")]
     undef: bool,
 
     /// Sort output by value instead of by symbol name.

plib/src/lib.rs

@@ -7,84 +7,13 @@
 // SPDX-License-Identifier: MIT
 //
 
-use std::io::Write;
-use std::process::{Command, Output, Stdio};
-
 pub mod group;
 pub mod io;
 pub mod modestr;
+pub mod testing;
 
 pub const PROJECT_NAME: &'static str = "posixutils-rs";
 
 pub const BUFSZ: usize = 8 * 1024;
 
-pub const TERM_VAR: &'static str = "TERM";
-pub const DEFAULT_TERM: &'static str = "vt100";
-
-pub struct TestPlan {
-    pub cmd: String,
-    pub args: Vec<String>,
-    pub stdin_data: String,
-    pub expected_out: String,
-    pub expected_err: String,
-    pub expected_exit_code: i32,
-}
-
-fn run_test_base(plan: TestPlan) -> (TestPlan, Output) {
-    let relpath = format!("target/release/{}", plan.cmd);
-    let test_bin_path = std::env::current_dir()
-        .unwrap()
-        .parent()
-        .unwrap() // Move up to the workspace root from the current package directory
-        .join(relpath); // Adjust the path to the binary
-
-    let mut command = Command::new(test_bin_path);
-    let mut child = command
-        .args(&plan.args)
-        .stdin(Stdio::piped())
-        .stdout(Stdio::piped())
-        .stderr(Stdio::piped())
-        .spawn()
-        .expect("failed to spawn head");
-
-    let stdin = child.stdin.as_mut().expect("failed to get stdin");
-    stdin
-        .write_all(plan.stdin_data.as_bytes())
-        .expect("failed to write to stdin");
-
-    let output = child.wait_with_output().expect("failed to wait for child");
-    (plan, output)
-}
-
-pub fn run_test(plan: TestPlan) {
-    let (plan, output) = run_test_base(plan);
-
-    let stdout = String::from_utf8_lossy(&output.stdout);
-    assert_eq!(stdout, plan.expected_out);
-
-    let stderr = String::from_utf8_lossy(&output.stderr);
-    assert_eq!(stderr, plan.expected_err);
-
-    assert_eq!(output.status.code(), Some(plan.expected_exit_code));
-    if plan.expected_exit_code == 0 {
-        assert!(output.status.success());
-    }
-}
-
-pub fn run_test_with_checker<F: FnMut(&TestPlan, &Output)>(plan: TestPlan, mut checker: F) {
-    let (plan, output) = run_test_base(plan);
-    checker(&plan, &output);
-}
-
-pub fn get_terminal() -> String {
-    let term: String = match std::env::var(TERM_VAR) {
-        Ok(val) => val,
-        Err(_) => String::new(),
-    };
-
-    if term.is_empty() {
-        String::from(DEFAULT_TERM)
-    } else {
-        term
-    }
-}
+pub use testing::*;

plib/src/testing.rs

@@ -0,0 +1,66 @@
+//
+// Copyright (c) 2024 Jeff Garzik
+//
+// This file is part of the posixutils-rs project covered under
+// the MIT License.  For the full license text, please see the LICENSE
+// file in the root directory of this project.
+// SPDX-License-Identifier: MIT
+//
+
+use std::io::Write;
+use std::process::{Command, Output, Stdio};
+
+pub struct TestPlan {
+    pub cmd: String,
+    pub args: Vec<String>,
+    pub stdin_data: String,
+    pub expected_out: String,
+    pub expected_err: String,
+    pub expected_exit_code: i32,
+}
+
+fn run_test_base(plan: TestPlan) -> (TestPlan, Output) {
+    let relpath = format!("target/release/{}", plan.cmd);
+    let test_bin_path = std::env::current_dir()
+        .unwrap()
+        .parent()
+        .unwrap() // Move up to the workspace root from the current package directory
+        .join(relpath); // Adjust the path to the binary
+
+    let mut command = Command::new(test_bin_path);
+    let mut child = command
+        .args(&plan.args)
+        .stdin(Stdio::piped())
+        .stdout(Stdio::piped())
+        .stderr(Stdio::piped())
+        .spawn()
+        .expect("failed to spawn head");
+
+    let stdin = child.stdin.as_mut().expect("failed to get stdin");
+    stdin
+        .write_all(plan.stdin_data.as_bytes())
+        .expect("failed to write to stdin");
+
+    let output = child.wait_with_output().expect("failed to wait for child");
+    (plan, output)
+}
+
+pub fn run_test(plan: TestPlan) {
+    let (plan, output) = run_test_base(plan);
+
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    assert_eq!(stdout, plan.expected_out);
+
+    let stderr = String::from_utf8_lossy(&output.stderr);
+    assert_eq!(stderr, plan.expected_err);
+
+    assert_eq!(output.status.code(), Some(plan.expected_exit_code));
+    if plan.expected_exit_code == 0 {
+        assert!(output.status.success());
+    }
+}
+
+pub fn run_test_with_checker<F: FnMut(&TestPlan, &Output)>(plan: TestPlan, mut checker: F) {
+    let (plan, output) = run_test_base(plan);
+    checker(&plan, &output);
+}