Merge pull request #225 from embassy-rs/esp-hil

Refactor l2cap hil test

.github/workflows/tests.yaml

@@ -66,6 +66,7 @@ jobs:
       - name: Test
         env:
           RUST_LOG: trace
+          RUST_TEST_THREADS: 1
         run: |
           cd host
           cargo test --features log --test '*' -- --nocapture
@@ -90,7 +91,7 @@ jobs:
 
   example-tests:
     runs-on: self-hosted
-    needs: [build]
+    needs: [build, integration-tests]
     steps:
       - uses: actions/checkout@v4
       - name: Checkout
@@ -117,6 +118,7 @@ jobs:
       - name: Test
         env:
           RUST_LOG: info
+          RUST_TEST_THREADS: 1
         run: |
           cd examples/tests
           find .

examples/tests/src/probe/mod.rs

@@ -1,3 +1,4 @@
+use probe_rs::flashing::Format;
 use probe_rs::probe::list::Lister;
 use probe_rs::probe::DebugProbeSelector;
 use probe_rs::{Permissions, Session};
@@ -32,11 +33,17 @@ pub struct ProbeSelector {
     targets: Vec<(AtomicBool, TargetConfig)>,
 }
 
+#[derive(Debug)]
 pub struct Target<'d> {
     config: TargetConfig,
     taken: &'d AtomicBool,
 }
 
+pub struct Firmware {
+    pub data: Vec<u8>,
+    pub format: Format,
+}
+
 impl ProbeSelector {
     fn new(config: ProbeConfig) -> Self {
         let mut targets = Vec::new();
@@ -71,18 +78,21 @@ impl ProbeSelector {
 }
 
 impl<'d> Target<'d> {
-    pub fn flash(self, elf: Vec<u8>) -> Result<TargetRunner<'d>, anyhow::Error> {
+    pub fn flash(self, fw: Firmware) -> Result<TargetRunner<'d>, anyhow::Error> {
         let probe = self.config.probe.clone();
         let p: DebugProbeSelector = probe.try_into()?;
+        log::info!("Debug probe selector created");
         let t = probe_rs::config::get_target_by_name(&self.config.chip)?;
+        log::info!("Target created");
 
         let lister = Lister::new();
+        log::info!("Opening probe");
         let probe = lister.open(p)?;
 
         let perms = Permissions::new().allow_erase_all();
+        log::info!("Attaching probe");
         let mut session = probe.attach(t, perms)?;
-        let opts = run::Options { do_flash: true };
-        let mut flasher = run::Flasher::new(elf, opts);
+        let mut flasher = run::Flasher::new(fw);
         flasher.flash(&mut session)?;
         Ok(TargetRunner {
             _target: self,
@@ -112,12 +122,15 @@ impl<'d> TargetRunner<'d> {
         })
         .await
         .unwrap();
-        result
-
-        //let mut res = String::new();
-        //for entry in entries {
-        //    writeln!(&mut res, "{} - {}", entry.level, entry.message).unwrap();
-        //}
-        //(ok, res.into_bytes())
+        match result {
+            Ok(halted) => {
+                if halted {
+                    Err(anyhow::anyhow!("Firmware stopped"))
+                } else {
+                    Ok(())
+                }
+            }
+            Err(e) => Err(e.into()),
+        }
     }
 }