fix: Test refactor

Moves the examples into binaries to allow them to be better called by the tests.
JonathanWoollett-Light · Oct 23, 2023 · a853749 · a853749
1 parent e29209c
commit a853749
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 9 deletions.
diff --git a/log-instrument/Cargo.toml b/log-instrument/Cargo.toml
@@ -8,6 +8,4 @@ license = "Apache-2.0"
 [dependencies]
 log-instrument-macros = { path = "../log-instrument-macros", version = "0.2.0" }
 log = "0.4.20"
-
-[dev-dependencies]
 env_logger = "0.10.0"
diff --git a/log-instrument/examples/five.rs → log-instrument/src/bin/five.rs b/log-instrument/examples/five.rs → log-instrument/src/bin/five.rs
diff --git a/log-instrument/examples/four.rs → log-instrument/src/bin/four.rs b/log-instrument/examples/four.rs → log-instrument/src/bin/four.rs
diff --git a/log-instrument/examples/one.rs → log-instrument/src/bin/one.rs b/log-instrument/examples/one.rs → log-instrument/src/bin/one.rs
diff --git a/log-instrument/examples/six.rs → log-instrument/src/bin/six.rs b/log-instrument/examples/six.rs → log-instrument/src/bin/six.rs
diff --git a/log-instrument/examples/three.rs → log-instrument/src/bin/three.rs b/log-instrument/examples/three.rs → log-instrument/src/bin/three.rs
diff --git a/log-instrument/examples/two.rs → log-instrument/src/bin/two.rs b/log-instrument/examples/two.rs → log-instrument/src/bin/two.rs
diff --git a/log-instrument/src/lib.rs b/log-instrument/src/lib.rs
@@ -8,7 +8,6 @@ type InnerPath = Mutex<HashMap<std::thread::ThreadId, Vec<&'static str>>>;
 static PATH: OnceLock<InnerPath> = OnceLock::new();
 fn path() -> &'static InnerPath {
     PATH.get_or_init(InnerPath::default)
-
 }
 
 pub struct __Instrument;

diff --git a/log-instrument/tests/integration_tests.rs b/log-instrument/tests/integration_tests.rs
@@ -1,9 +1,9 @@
-const ONE: &str = "../target/debug/examples/one";
-const TWO: &str = "../target/debug/examples/two";
-const THREE: &str = "../target/debug/examples/three";
-const FOUR: &str = "../target/debug/examples/four";
-const FIVE: &str = "../target/debug/examples/five";
-const SIX: &str = "../target/debug/examples/six";
+const ONE: &str = env!("CARGO_BIN_EXE_one");
+const TWO: &str = env!("CARGO_BIN_EXE_two");
+const THREE: &str = env!("CARGO_BIN_EXE_three");
+const FOUR: &str = env!("CARGO_BIN_EXE_four");
+const FIVE: &str = env!("CARGO_BIN_EXE_five");
+const SIX: &str = env!("CARGO_BIN_EXE_six");
 
 const TIMESTAMP_RANGE: std::ops::Range<usize> = 1..20;