commit c7ce047cff354062003e2ce1dcf779119053b06a
author Alphan Ulusoy <alphan@google.com> Wed Sep 07 13:52:44 2022 -0400
committer Alphan Ulusoy <alphan@google.com> Thu Sep 08 12:47:55 2022 -0400
tree f56669eedd104442caacebc4e4fe96667ce194a4
parent 604d471bebf037c25a834e365b934e9ad1fff36c

[test] Use BootstrapTest to isolate individual test points

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs

diff --git a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
index 567347d..9ef385d 100644
--- a/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
+++ b/sw/host/tests/rom/e2e_bootstrap_entry/src/main.rs
@@ -99,6 +99,8 @@
 }
 
 fn test_bootstrap_enabled_requested(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
+    let _bs = BootstrapTest::start(transport, opts.init.bootstrap.options.reset_delay)?;
+
     // TODO: Should really `opts.init.uart_params.create()` here, but we need to refactor
     // BootstrapOptions first.
     //let uart = opts.init.uart_params.create(&transport)?;
@@ -140,7 +142,6 @@
         ..Default::default()
     };
 
-    transport.remove_pin_strapping("ROM_BOOTSTRAP")?;
     transport.reset_target(opts.init.bootstrap.options.reset_delay, true)?;
 
     // Now watch the console for the exit conditions.
@@ -168,6 +169,8 @@
 }
 
 fn test_jedec_id(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
+    let _bs = BootstrapTest::start(transport, opts.init.bootstrap.options.reset_delay)?;
+
     let spi = transport.spi("0")?;
     let id = SpiFlash::read_jedec_id(&*spi, 16)?;
     log::info!("Read jedec id: {:x?}", id);
@@ -187,7 +190,9 @@
     Ok(())
 }
 
-fn test_write_enable_disable(transport: &TransportWrapper) -> Result<()> {
+fn test_write_enable_disable(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
+    let _bs = BootstrapTest::start(transport, opts.init.bootstrap.options.reset_delay)?;
+
     let spi = transport.spi("0")?;
 
     assert_eq!(SpiFlash::read_status(&*spi)?, 0x0);
@@ -202,6 +207,8 @@
 }
 
 fn test_sfdp(opts: &Opts, transport: &TransportWrapper) -> Result<()> {
+    let _bs = BootstrapTest::start(transport, opts.init.bootstrap.options.reset_delay)?;
+
     let spi = transport.spi("0")?;
     let sfdp = SpiFlash::read_sfdp(&*spi)?;
     log::info!("SFDP: {:#x?}", sfdp);
@@ -253,6 +260,6 @@
     execute_test!(test_bootstrap_enabled_requested, &opts, &transport);
     execute_test!(test_jedec_id, &opts, &transport);
     execute_test!(test_sfdp, &opts, &transport);
-    execute_test!(test_write_enable_disable, &transport);
+    execute_test!(test_write_enable_disable, &opts, &transport);
     Ok(())
 }