CodeHealth: remove testing-commandline from production builds #19

Author: asakatida

.github/workflows/ci.yml

@@ -46,7 +46,7 @@ jobs:
 
       - name: Test
         run: |
-          cargo test
+          cargo test --features testing_commandline
 
   fmt:
     name: cargo fmt --all -- --check

Cargo.toml

@@ -38,6 +38,10 @@ path = "src/xargs/main.rs"
 [[bin]]
 name = "testing-commandline"
 path = "src/testing/commandline/main.rs"
+required-features = ["testing_commandline"]
+
+[features]
+testing_commandline = []
 
 [profile.release]
 lto = "thin"

tests/common/test_helpers.rs

@@ -5,6 +5,7 @@
 // https://opensource.org/licenses/MIT.
 
 use std::cell::RefCell;
+#[cfg(feature = "testing_commandline")]
 use std::env;
 use std::io::{Cursor, Read, Write};
 use std::path::Path;
@@ -52,6 +53,7 @@ impl Dependencies for FakeDependencies {
     }
 }
 
+#[cfg(feature = "testing_commandline")]
 pub fn path_to_testing_commandline() -> String {
     let mut path_to_use = env::current_exe()
         // this will be something along the lines of /my/homedir/findutils/target/debug/deps/findutils-5532804878869ef1

tests/exec_unit_tests.rs

@@ -8,20 +8,28 @@
 /// ! But as the tests require running an external executable, they need to be run
 /// ! as integration tests so we can ensure that our testing-commandline binary
 /// ! has been built.
-use std::env;
-use std::fs::File;
-use std::io::Read;
+#[cfg(feature = "testing_commandline")]
+use std::{env, fs::File, io::Read};
 use std::path::Path;
+
+#[cfg(feature = "testing_commandline")]
 use tempfile::Builder;
 
+#[cfg(feature = "testing_commandline")]
+use common::test_helpers::{fix_up_slashes, path_to_testing_commandline};
 use common::test_helpers::{
-    fix_up_slashes, get_dir_entry_for, path_to_testing_commandline, FakeDependencies,
+    get_dir_entry_for, FakeDependencies,
 };
-use findutils::find::matchers::exec::{MultiExecMatcher, SingleExecMatcher};
-use findutils::find::matchers::{Matcher, MatcherIO};
+#[cfg(feature = "testing_commandline")]
+use findutils::find::matchers::exec::SingleExecMatcher;
+use findutils::find::matchers::exec::MultiExecMatcher;
+#[cfg(feature = "testing_commandline")]
+use findutils::find::matchers::MatcherIO;
+use findutils::find::matchers::Matcher;
 
 mod common;
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn matching_executes_code() {
     let temp_dir = Builder::new()
@@ -53,6 +61,7 @@ fn matching_executes_code() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn matching_executes_code_in_files_directory() {
     let temp_dir = Builder::new()
@@ -84,6 +93,7 @@ fn matching_executes_code_in_files_directory() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn matching_embedded_filename() {
     let temp_dir = Builder::new()
@@ -115,6 +125,7 @@ fn matching_embedded_filename() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 /// Running "find . -execdir whatever \;" failed with a No such file or directory error.
 /// It's now fixed, and this is a regression test to check that it stays fixed.
@@ -148,6 +159,7 @@ fn execdir_in_current_directory() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 /// Regression test for "find / -execdir whatever \;"
 fn execdir_in_root_directory() {
@@ -187,6 +199,7 @@ fn execdir_in_root_directory() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn matching_fails_if_executable_fails() {
     let temp_dir = Builder::new()
@@ -225,6 +238,7 @@ fn matching_fails_if_executable_fails() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn matching_multi_executes_code() {
     let temp_dir = Builder::new()
@@ -258,6 +272,7 @@ fn matching_multi_executes_code() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn execdir_multi_in_current_directory() {
     let temp_dir = Builder::new()
@@ -292,6 +307,7 @@ fn execdir_multi_in_current_directory() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn multi_set_exit_code_if_executable_fails() {
     let temp_dir = Builder::new()

tests/find_exec_tests.rs

@@ -4,6 +4,7 @@
 // license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
+#![cfg(feature = "testing_commandline")]
 /// ! This file contains what would be normally be unit tests for `find::find_main`
 /// ! related to -exec[dir] and ok[dir] clauses.
 /// ! But as the tests require running an external executable, they need to be run

tests/test_xargs.rs

@@ -9,6 +9,7 @@
 // testing-commandline binary is guaranteed to be built first.
 use uutests::util::TestScenario;
 
+#[cfg(feature = "testing_commandline")]
 use common::test_helpers::path_to_testing_commandline;
 
 mod common;
@@ -185,6 +186,7 @@ fn xargs_exit_on_large() {
         .no_stdout();
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_exec() {
     let result = ucmd()
@@ -205,6 +207,7 @@ fn xargs_exec() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_exec_stdin_open() {
     let temp_file = tempfile::NamedTempFile::new().unwrap();
@@ -228,6 +231,7 @@ fn xargs_exec_stdin_open() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_exec_failure() {
     let result = ucmd()
@@ -249,6 +253,7 @@ fn xargs_exec_failure() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_exec_urgent_failure() {
     let result = ucmd()
@@ -272,6 +277,7 @@ fn xargs_exec_urgent_failure() {
     );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 #[cfg(unix)]
 fn xargs_exec_with_signal() {
@@ -305,6 +311,7 @@ fn xargs_exec_not_found() {
         .no_stdout();
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_exec_verbose() {
     ucmd()
@@ -325,6 +332,7 @@ fn xargs_exec_verbose() {
         );
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_unterminated_quote() {
     ucmd()
@@ -341,6 +349,7 @@ fn xargs_unterminated_quote() {
         .no_stdout();
 }
 
+#[cfg(feature = "testing_commandline")]
 #[test]
 fn xargs_zero_lines() {
     ucmd()