Evolve[Tests]: minitrace-tests

Signed-off-by: Mark Van de Vyver <[email protected]>

Author: taqtiqa-mark

minitrace-tests/Cargo.toml

@@ -11,15 +11,15 @@ edition = "2021"
 default = []
 ci = []
 as = ["async-std"]
-ea = ["embassy"]
+# ea = ["embassy"]
 tk = ["tokio"]
 
 [lib]
 
 # Avoid adding crates, this is widely used in tests. It should compile fast!
 [dependencies]
 async-std = { version = "1.11.0", features = ["attributes"], optional = true }
-embassy = { version = "0.1.0", path = "./embassy/embassy", features = ["defmt", "nightly"], optional = true  }
+# embassy = { version = "0.1.0", path = "./embassy/embassy", features = ["defmt", "nightly"], optional = true  }
 futures = "0.3.21"
 futures-timer = "3.0.2"
 macrotest = "1"
@@ -38,7 +38,13 @@ inventory = "0.2.2"
 # cargo test --features minitrace-tests/tk --manifest-path minitrace-tests/Cargo.toml default2 -- --nocapture
 #
 [[test]]
-name = "defaults-indev-tokio"
+name = "indev-tokio"
 path = "integration/indev.rs"
 harness = false
 required-features = ["tk"]
+
+# [[test]]
+# name = "dev-tokio"
+# path = "src/main.rs"
+# harness = false
+# required-features = ["tk"]

minitrace-tests/README.md

@@ -11,20 +11,24 @@ fraught exercise to change this (working) test harness - here be dragons.
 
 We aren't the first to bang our heads on this:
 
-***Thanks to the [Fluvio project](https://github.com/infinyon/fluvio) team and
-[Infinyon](https://www.infinyon.com) for sharing the details about [how to do
-this](https://www.infinyon.com/blog/2021/04/rust-custom-test-harness/).***
+***
+Thanks to the following for [how to do this](https://www.infinyon.com/blog/2021/04/rust-custom-test-harness/)
+
+- [Infinyon](https://www.infinyon.com) .
+- [Fluvio project](https://github.com/infinyon/fluvio)
+
+***
 
 ## Developing against a test
 
-1. Add the test file, say `build/issues/nnn.rs`.
+1. Add the test file, say `tests/issues/nnn.rs`.
 2. Point the in-development test runner to this file:
 
     ```rust
-    // minitrace-tests/src/build/issues.rs
+    // minitrace-tests/src/tests/issues.rs
     pub fn indev() {
         // To generate macro result files
-        macrotest::expand("src/build/issues/nnn.rs");
+        macrotest::expand("src/tests/issues/nnn.rs");
         build_indev();
     }
     ```
@@ -34,16 +38,15 @@ this](https://www.infinyon.com/blog/2021/04/rust-custom-test-harness/).***
 
     ```bash
     cargo test --manifest-path minitrace-tests/Cargo.toml \
-               build::issues::indev \
+               tests::issues::indev \
                -- --nocapture
     ```
 
     or
 
     ```bash
     cd minitrace-tests
-    cargo test build::issues::indev \
-               -- --nocapture
+    cargo test build::issues::indev -- --nocapture
     ```
 
 5. Iterate 3) and 4) until green.
@@ -58,8 +61,7 @@ Add several test cases (developed as above) in the issues category
 2. Generate the expanded Rust code:
 
     ```bash
-    cargo test issues-dev-tokio \
-               --no-fail-fast &>~/tmp/log.txt
+    cargo test issues-dev-tokio --no-fail-fast &>~/tmp/log.txt
     ```
 
 3. Check the expanded code is as expected: `build/issues/nnn.expanded.rs`

minitrace-tests/integration/indev.rs

@@ -11,7 +11,7 @@ fn teardown() {
 }
 // NOTE: This function is executed by `cargo test -- --list`.
 // Hence we guard it:
-#[cfg(any(feature = "as", feature = "ea", feature = "tk"))]
+#[cfg(any(feature = "as", feature = "tk"))]
 fn main() {
     // Setup test environment
     setup();

minitrace-tests/integration/main.rs

@@ -1,7 +1,7 @@
 pub mod tests;
 
-use minitrace_tests::main_runtime;
-use minitrace_tests::main_tokio;
+// use minitrace_tests::main_runtime;
+// use minitrace_tests::main_tokio;
 use tests::IntegrationTest;
 
 fn setup() {
@@ -14,7 +14,7 @@ fn teardown() {
 // NOTE:
 // When this code is in src/main.rs, it is executed by `cargo test -- --list`.
 // In such cases you can guard it:
-// #[cfg(any(feature = "as", feature = "ea", feature = "tk"))]
+// #[cfg(any(feature = "as", feature = "tk"))]
 fn main() {
     // Setup test environment
     setup();

minitrace-tests/integration/tests/defaults.rs

@@ -17,13 +17,13 @@ inventory::submit!(IntegrationTest {
 #[cfg(not(feature = "ci"))]
 pub fn indev() {
     // To generate macro result files
-    let src = "src/tests/defaults/no-be-no-drop-local.rs";
-    let srcx = "src/tests/defaults/no-be-no-drop-local.expanded.rs";
+    let src = "integration/tests/defaults/no-be-no-drop-local.rs";
+    let srcx = "integration/tests/defaults/no-be-no-drop-local.expanded.rs";
 
     #[cfg(feature = "as")]
     macrotest::expand_args(src, &["--features", "minitrace-tests/as"]);
-    #[cfg(feature = "ea")]
-    macrotest::expand_args(src, &["--features", "minitrace-tests/ea"]);
+    // #[cfg(feature = "ea")]
+    // macrotest::expand_args(src, &["--features", "minitrace-tests/ea"]);
     #[cfg(feature = "tk")]
     macrotest::expand_args(
         src,
@@ -46,24 +46,24 @@ fn build_indev(src: &str) {
 #[cfg(not(feature = "ci"))]
 pub fn dev() {
     // To generate macro result files
-    macrotest::expand("src/build/defaults/*.rs");
+    macrotest::expand("integration/tests/defaults/*.rs");
     build_dev();
 }
 
 fn build_dev() {
     let t = trybuild::TestCases::new();
-    t.pass("src/build/defaults/*.expanded.rs");
+    t.pass("integration/tests/defaults/*.expanded.rs");
 }
 
 // #[test]
 #[cfg(feature = "ci")]
 pub fn ci() {
     // To test generated macro result files
-    macrotest::expand_without_refresh("tests/expand/defaults/*.rs");
+    macrotest::expand_without_refresh("src/tests/expand/defaults/*.rs");
     build_ci();
 }
 
 fn build_ci() {
     let t = trybuild::TestCases::new();
-    t.pass("tests/expand/defaults/*.expanded.rs");
+    t.pass("scr/tests/expand/defaults/*.expanded.rs");
 }

minitrace-tests/integration/tests/defaults/no-be-no-drop-local.rs

@@ -1,4 +1,4 @@
-use embassy::task;
+// use embassy::task;
 use minitrace::trace;
 use test_utilities::*;
 use minitrace_tests::main_runtime;
@@ -17,10 +17,10 @@ main_runtime2!();
 // - https://github.com/tikv/minitrace-rust/issues/125
 // - https://github.com/tikv/minitrace-rust/issues/126
 #[trace]
-#[embassy::task]
-async fn test_esync(a: u32) -> u32 {
-    a
-}
+// #[embassy::task]
+// async fn test_esync(a: u32) -> u32 {
+//     a
+// }
 
 async fn test_async(a: u32) -> u32 {
     a

minitrace-tests/integration/tests/issues.rs

@@ -10,20 +10,20 @@
 #[cfg(not(feature = "ci"))]
 pub fn indev() {
     // To generate macro result files
-    macrotest::expand("src/build/issues/non-drop-local.rs");
+    macrotest::expand("integration/tests/issues/non-drop-local.rs");
     build_indev();
 }
 
 fn build_indev() {
     let t = trybuild::TestCases::new();
-    t.pass("src/build/issues/*.expanded.rs");
+    t.pass("integration/tests/issues/*.expanded.rs");
 }
 
 #[test]
 #[cfg(not(feature = "ci"))]
 pub fn dev() {
     // To generate macro result files
-    macrotest::expand("src/build/issues/*.rs");
+    macrotest::expand("integration/tests/issues/*.rs");
     build_dev();
 }