From 40c2ca96411caaeab1563ff9041879f742d1d71b Mon Sep 17 00:00:00 2001
From: Jakub Beránek <berykubik@gmail.com>
Date: Thu, 12 Jun 2025 14:34:33 +0200
Subject: Move `shared_helpers` test to a dedicated module

---
 src/bootstrap/src/utils/shared_helpers.rs          |  3 ++
 src/bootstrap/src/utils/shared_helpers/tests.rs    | 28 +++++++++++++++++
 src/bootstrap/src/utils/tests/mod.rs               |  1 -
 .../src/utils/tests/shared_helpers_tests.rs        | 35 ----------------------
 4 files changed, 31 insertions(+), 36 deletions(-)
 create mode 100644 src/bootstrap/src/utils/shared_helpers/tests.rs
 delete mode 100644 src/bootstrap/src/utils/tests/shared_helpers_tests.rs

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/src/utils/shared_helpers.rs b/src/bootstrap/src/utils/shared_helpers.rs
index 561af34a447..9c6b4a7615d 100644
--- a/src/bootstrap/src/utils/shared_helpers.rs
+++ b/src/bootstrap/src/utils/shared_helpers.rs
@@ -6,6 +6,9 @@
 
 #![allow(dead_code)]
 
+#[cfg(test)]
+mod tests;
+
 use std::env;
 use std::ffi::OsString;
 use std::fs::OpenOptions;
diff --git a/src/bootstrap/src/utils/shared_helpers/tests.rs b/src/bootstrap/src/utils/shared_helpers/tests.rs
new file mode 100644
index 00000000000..559e9f70abd
--- /dev/null
+++ b/src/bootstrap/src/utils/shared_helpers/tests.rs
@@ -0,0 +1,28 @@
+use crate::utils::shared_helpers::parse_value_from_args;
+
+#[test]
+fn test_parse_value_from_args() {
+    let args = vec![
+        "--stage".into(),
+        "1".into(),
+        "--version".into(),
+        "2".into(),
+        "--target".into(),
+        "x86_64-unknown-linux".into(),
+    ];
+
+    assert_eq!(parse_value_from_args(args.as_slice(), "--stage").unwrap(), "1");
+    assert_eq!(parse_value_from_args(args.as_slice(), "--version").unwrap(), "2");
+    assert_eq!(parse_value_from_args(args.as_slice(), "--target").unwrap(), "x86_64-unknown-linux");
+    assert!(parse_value_from_args(args.as_slice(), "random-key").is_none());
+
+    let args = vec![
+        "app-name".into(),
+        "--key".into(),
+        "value".into(),
+        "random-value".into(),
+        "--sysroot=/x/y/z".into(),
+    ];
+    assert_eq!(parse_value_from_args(args.as_slice(), "--key").unwrap(), "value");
+    assert_eq!(parse_value_from_args(args.as_slice(), "--sysroot").unwrap(), "/x/y/z");
+}
diff --git a/src/bootstrap/src/utils/tests/mod.rs b/src/bootstrap/src/utils/tests/mod.rs
index 73d55db994c..c2bf1c3ee8a 100644
--- a/src/bootstrap/src/utils/tests/mod.rs
+++ b/src/bootstrap/src/utils/tests/mod.rs
@@ -1,2 +1 @@
 pub mod git;
-mod shared_helpers_tests;
diff --git a/src/bootstrap/src/utils/tests/shared_helpers_tests.rs b/src/bootstrap/src/utils/tests/shared_helpers_tests.rs
deleted file mode 100644
index 6c47e7f2438..00000000000
--- a/src/bootstrap/src/utils/tests/shared_helpers_tests.rs
+++ /dev/null
@@ -1,35 +0,0 @@
-//! The `shared_helpers` module can't have its own tests submodule, because
-//! that would cause problems for the shim binaries that include it via
-//! `#[path]`, so instead those unit tests live here.
-//!
-//! To prevent tidy from complaining about this file not being named `tests.rs`,
-//! it lives inside a submodule directory named `tests`.
-
-use crate::utils::shared_helpers::parse_value_from_args;
-
-#[test]
-fn test_parse_value_from_args() {
-    let args = vec![
-        "--stage".into(),
-        "1".into(),
-        "--version".into(),
-        "2".into(),
-        "--target".into(),
-        "x86_64-unknown-linux".into(),
-    ];
-
-    assert_eq!(parse_value_from_args(args.as_slice(), "--stage").unwrap(), "1");
-    assert_eq!(parse_value_from_args(args.as_slice(), "--version").unwrap(), "2");
-    assert_eq!(parse_value_from_args(args.as_slice(), "--target").unwrap(), "x86_64-unknown-linux");
-    assert!(parse_value_from_args(args.as_slice(), "random-key").is_none());
-
-    let args = vec![
-        "app-name".into(),
-        "--key".into(),
-        "value".into(),
-        "random-value".into(),
-        "--sysroot=/x/y/z".into(),
-    ];
-    assert_eq!(parse_value_from_args(args.as_slice(), "--key").unwrap(), "value");
-    assert_eq!(parse_value_from_args(args.as_slice(), "--sysroot").unwrap(), "/x/y/z");
-}
-- 
cgit 1.4.1-3-g733a5