[bazel,test] Apply new testopt to tests

Change-Id: Ic05c77684e2d7577bcd328872a230d396035847d
Signed-off-by: Yi-Hsuan Deng <[email protected]>

Author: sasdf

sw/device/lib/testing/test_framework/BUILD

@@ -358,9 +358,6 @@ opentitan_test(
     fpga = fpga_params(
         flow_control_message = _FLOW_CONTROL_MESSAGE,
         test_cmd = """
-            --exec="transport init"
-            --exec="fpga load-bitstream {bitstream}"
-            --exec="bootstrap --clear-uart=true {firmware}"
             --exec="console --non-interactive --exit-success=WAIT --exit-failure=PASS|FAIL --flow-control"
             console
             --flow-control

sw/device/silicon_creator/lib/drivers/BUILD

@@ -983,9 +983,6 @@ opentitan_test(
         EARLGREY_SILICON_OWNER_ROM_EXT_ENVS,
     ),
     fpga = fpga_params(
-        test_cmd = """
-            --bootstrap={firmware}
-        """,
         test_harness = "//sw/host/tests/chip/usb:silicon_creator_harness",
     ),
     silicon = silicon_params(

sw/device/silicon_creator/lib/sigverify/sigverify_tests/BUILD

@@ -31,9 +31,7 @@ opentitan_test(
     fpga = fpga_params(
         timeout = "moderate",
         data = _TEST_VECTORS,
-        test_cmd = """
-                --bootstrap={firmware}
-            """ + _TEST_ARGS,
+        test_cmd = _TEST_ARGS,
         test_harness = "//sw/host/tests/crypto/ecdsa_kat:harness",
     ),
     deps = [

sw/device/silicon_creator/manuf/base/BUILD

@@ -147,6 +147,7 @@ opentitan_test(
             --test-sram-elf={sram_cp_provision_functest}
         """,
         test_harness = "//sw/host/tests/manuf/cp_provision_functest",
+        testopt_bootstrap = "False",
     ),
 )
 

sw/device/silicon_creator/manuf/lib/BUILD

@@ -214,9 +214,6 @@ opentitan_test(
         changes_otp = True,
         otp = "//hw/ip/otp_ctrl/data:img_test_unlocked1",
         tags = ["manuf"],
-        test_cmd = """
-            --bootstrap={firmware}
-        """,
         test_harness = "//sw/host/tests/manuf/individualize_sw_cfg_functest",
     ),
     deps = [
@@ -278,9 +275,6 @@ opentitan_test(
             "lc_dev",
             "manuf",
         ],
-        test_cmd = """
-            --bootstrap={firmware}
-        """,
         test_harness = "//sw/host/tests/manuf/personalize_functest",
     ),
     spx_key = {"//sw/device/silicon_creator/rom/keys/fake/spx:spx_keyset": "dev_key_0"},

sw/device/silicon_creator/manuf/tests/BUILD

@@ -88,12 +88,9 @@ _MANUF_TEST_LOCKED_KEY = None
             needs_jtag = True,
             otp = "//hw/ip/otp_ctrl/data:img_{}".format(lc_state.lower()),
             tags = ["manuf"],
-            test_cmd = (
-                "" if (
-                    (lc_state, lc_val) in _TEST_LOCKED_LC_ITEMS
-                ) else "--bootstrap={firmware}"
-            ) + " --initial-lc-state={lc_state}",
+            test_cmd = "--initial-lc-state={lc_state}",
             test_harness = "//sw/host/tests/manuf/manuf_scrap",
+            testopt_bootstrap = str((lc_state, lc_val) not in _TEST_LOCKED_LC_ITEMS),
         ),
         deps = [
             "//sw/device/lib/runtime:log",
@@ -191,6 +188,7 @@ opentitan_test(
             tags = ["manuf"],
             test_cmd = "--initial-lc-state={lc_state}",
             test_harness = "//sw/host/tests/manuf/manuf_cp_yield_test",
+            testopt_bootstrap = "False",
         ),
         deps = [
             "//hw/ip/otp_ctrl/data:otp_ctrl_c_regs",
@@ -262,6 +260,7 @@ cc_library(
             tags = ["manuf"],
             test_cmd = "--elf={firmware}",
             test_harness = "//sw/host/tests/manuf/manuf_sram_program_crc_check",
+            testopt_bootstrap = "False",
         ),
         kind = "ram",
         linker_script = "//sw/device/silicon_creator/manuf/lib:sram_program_linker_script",
@@ -355,7 +354,6 @@ opentitan_binary(
             tags = ["manuf"],
             target_lc_state = target_lc_state,  # will be expanded in test_cmd
             test_cmd = """
-                --bootstrap={firmware}
                 --target-lc-state={target_lc_state}
                 --elf={sram_program}
             """,
@@ -440,6 +438,7 @@ opentitan_binary(
                 --elf={sram_program}
             """,
             test_harness = "//sw/host/tests/manuf/manuf_cp_ast_test_execution",
+            testopt_bootstrap = "False",
         ),
         deps = [
             "//sw/device/lib/runtime:log",
@@ -557,9 +556,6 @@ opentitan_test(
     },
     fpga = fpga_params(
         tags = ["manuf"],
-        test_cmd = """
-            --bootstrap={firmware}
-        """,
         test_harness = "//sw/host/tests/manuf/manuf_ujson_msg_size",
     ),
     deps = [
@@ -579,9 +575,6 @@ opentitan_test(
     },
     fpga = fpga_params(
         tags = ["manuf"],
-        test_cmd = """
-            --bootstrap={firmware}
-        """,
         test_harness = "//sw/host/tests/manuf/manuf_ujson_msg_padding",
     ),
     deps = [

sw/device/silicon_creator/rom/BUILD

@@ -554,9 +554,6 @@ opentitan_test(
             # This is a manual test.  Run it with:
             #     --test_output=streamed --copt=-DSTACK_UTILIZATION_CHECK
             ###########################################################################'"
-            --exec="transport init"
-            --exec="fpga load-bitstream {bitstream}"
-
             --exec="no-op --info '### Measuring stack utilization for bootstrap slot A'"
             --exec="bootstrap --clear-uart=true --leave-in-bootstrap {good_a}"
             --exec="console --non-interactive --exit-success='{stack_usage}' --exit-failure='{exit_failure}'"
@@ -598,6 +595,7 @@ opentitan_test(
             --exec="console --non-interactive --exit-success='{stack_usage}' --exit-failure='PASS|FAIL'"
             no-op
         """,
+        testopt_bootstrap = "False",
     ),
     exec_env = {
         "//hw/top_earlgrey:fpga_cw310_rom_with_fake_keys": None,

sw/device/silicon_creator/rom/e2e/BUILD

@@ -458,14 +458,7 @@ opentitan_test(
         exit_success = "min_security_version_rom_ext:0(?s:.*)min_security_version_rom_ext:1(?s:.*)" + MSG_TEMPLATE_BFV.format(hex_digits(CONST.BFV.BOOT_POLICY.ROLLBACK)),
         # We clear the bitstream to force any subsequent test to load a
         # fresh bitstream and clear all memories (ie: flash-based boot policy).
-        test_cmd = """
-            --exec="transport init"
-            --exec="fpga load-bitstream {bitstream}"
-            --exec="bootstrap --clear-uart=true {firmware}"
-            --exec="console --non-interactive --exit-success='{exit_success}' --exit-failure='{exit_failure}'"
-            --exec="fpga clear-bitstream\"
-            no-op
-        """,
+        testopt_clear_after_test = "True",
     ),
     linker_script = "//sw/device/lib/testing/test_framework:ottf_ld_silicon_creator_slot_a",
     deps = [

sw/device/silicon_creator/rom/e2e/bootstrap/BUILD

@@ -77,9 +77,6 @@ opentitan_test(
         changes_otp = True,
         needs_jtag = True,
         otp = "otp_img_bootstrap_rma",
-        test_cmd = """
-            --bootstrap="{firmware}"
-        """,
         test_harness = "//sw/host/tests/rom/e2e_bootstrap_rma",
     ),
     deps = [

sw/device/silicon_creator/rom/e2e/chip_specific_startup/BUILD

@@ -30,7 +30,6 @@ package(default_visibility = ["//visibility:public"])
             otp = "//sw/device/silicon_creator/rom/e2e/rom_e2e_bootstrap_entry:otp_img_e2e_bootstrap_entry_{}".format(lc_state),
             tags = maybe_skip_in_ci(lc_state_val),
             test_cmd = """
-                --bootstrap="{firmware}"
                 --otp-unprogrammed
             """,
             test_harness = "//sw/host/tests/rom/e2e_chip_specific_startup",