Fix running of tests

xtask/src/cargo_commands.rs

@@ -302,7 +302,7 @@ pub fn cargo_book<'c>(
 /// Run examples
 ///
 /// Supports updating the expected output via the overwrite argument
-pub fn run_test<'c>(
+pub fn qemu_run_examples<'c>(
     globals: &Globals,
     cargoarg: &'c Option<&'c str>,
     backend: Backends,
@@ -312,31 +312,30 @@ pub fn run_test<'c>(
     let target = backend.to_target();
     let features = Some(target.and_features(backend.to_rtic_feature()));
 
-    examples_iter(examples)
+    let build = examples_iter(examples).map(|example| {
-        .map(|example| {
+        let cmd_build = CargoCommand::ExampleBuild {
-            let cmd = CargoCommand::ExampleBuild {
+            // We need to be in the correct
-                cargoarg: &Some("--quiet"),
+            cargoarg: &None,
             example,
             target,
             features: features.clone(),
             mode: BuildMode::Release,
         };
+        (globals, cmd_build, overwrite)
+    });
 
-            if let Err(err) = command_parser(globals, &cmd, false) {
+    let run = examples_iter(examples).map(|example| {
-                error!("{err}");
+        let cmd_qemu = CargoCommand::Qemu {
-            }
-
-            let cmd = CargoCommand::Qemu {
             cargoarg,
             example,
             target,
             features: features.clone(),
             mode: BuildMode::Release,
         };
+        (globals, cmd_qemu, overwrite)
+    });
 
-            (globals, cmd, overwrite)
+    build.chain(run).run_and_coalesce()
-        })
-        .run_and_coalesce()
 }
 
 /// Check the binary sizes of examples

xtask/src/command.rs

@@ -593,6 +593,11 @@ impl<'a> CargoCommand<'a> {
                 if let Some(cargoarg) = cargoarg {
                     args.extend_from_slice(&[cargoarg]);
                 }
+
+                // We need to be in the `rtic` directory to pick up
+                // the correct .cargo/config.toml file
+                args.extend_from_slice(&["-Z", "unstable-options", "-C", "rtic"]);
+
                 args.extend_from_slice(&[
                     self.command(),
                     "--example",
@@ -856,7 +861,7 @@ pub fn handle_results(globals: &Globals, results: Vec<FinalRunResult>) -> Result
         if globals.verbose > 0 {
             info!("✅ Success: {cmd}{path}\n    {}", cmd.as_cmd_string());
         } else {
-            info!("✅ Success:{cmd}{path}");
+            info!("✅ Success: {cmd}{path}");
         }
     });
 

xtask/src/main.rs

@@ -268,7 +268,7 @@ fn main() -> anyhow::Result<()> {
         Commands::Qemu(args) | Commands::Run(args) => {
             // x86_64 target not valid
             info!("Testing for backend: {backend:?}");
-            run_test(
+            qemu_run_examples(
                 globals,
                 &cargologlevel,
                 backend,