twister: hwmap: add script parameter support

for pre/post/post_flash script, add timeout as param Signed-off-by: Hake Huang <[email protected]>
nimams · Sep 16, 2024 · 7f63faa · 7f63faa
1 parent 1dde706
commit 7f63faa
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 5 deletions.
diff --git a/scripts/pylib/twister/twisterlib/handlers.py b/scripts/pylib/twister/twisterlib/handlers.py
@@ -689,9 +689,13 @@ def handle(self, harness):
         pre_script = hardware.pre_script
         post_flash_script = hardware.post_flash_script
         post_script = hardware.post_script
+        script_param = hardware.script_param
 
         if pre_script:
-            self.run_custom_script(pre_script, 30)
+            timeout = 30
+            if script_param:
+                timeout = script_param.get("pre_script_timeout", timeout)
+            self.run_custom_script(pre_script, timeout)
 
         flash_timeout = hardware.flash_timeout
         if hardware.flash_with_test:
@@ -756,7 +760,10 @@ def handle(self, harness):
             flash_error = True
 
         if post_flash_script:
-            self.run_custom_script(post_flash_script, 30)
+            timeout = 30
+            if script_param:
+                timeout = script_param.get("post_flash_timeout", timeout)
+            self.run_custom_script(post_flash_script, timeout)
 
         # Connect to device after flashing it
         if hardware.flash_before:
@@ -795,7 +802,10 @@ def handle(self, harness):
         self._final_handle_actions(harness, handler_time)
 
         if post_script:
-            self.run_custom_script(post_script, 30)
+            timeout = 30
+            if script_param:
+                timeout = script_param.get("post_script_timeout", timeout)
+            self.run_custom_script(post_script, timeout)
 
         self.make_dut_available(hardware)
 

diff --git a/scripts/pylib/twister/twisterlib/hardwaremap.py b/scripts/pylib/twister/twisterlib/hardwaremap.py
@@ -47,6 +47,7 @@ def __init__(self,
                  pre_script=None,
                  post_script=None,
                  post_flash_script=None,
+                 script_param=None,
                  runner=None,
                  flash_timeout=60,
                  flash_with_test=False,
@@ -70,6 +71,7 @@ def __init__(self,
         self.post_flash_script = post_flash_script
         self.post_script = post_script
         self.pre_script = pre_script
+        self.script_param = script_param
         self.probe_id = None
         self.notes = None
         self.lock = Lock()
@@ -248,6 +250,7 @@ def load(self, map_file):
         duts = scl.yaml_load_verify(map_file, hwm_schema)
         for dut in duts:
             pre_script = dut.get('pre_script')
+            script_param = dut.get('script_param')
             post_script = dut.get('post_script')
             post_flash_script = dut.get('post_flash_script')
             flash_timeout = dut.get('flash_timeout') or self.options.device_flash_timeout
@@ -282,6 +285,7 @@ def load(self, map_file):
                           flash_before=flash_before,
                           post_script=post_script,
                           post_flash_script=post_flash_script,
+                          script_param=script_param,
                           flash_timeout=flash_timeout,
                           flash_with_test=flash_with_test)
             new_dut.fixtures = fixtures

diff --git a/scripts/schemas/twister/hwmap-schema.yaml b/scripts/schemas/twister/hwmap-schema.yaml
@@ -64,3 +64,16 @@ sequence:
       "flash_before":
         type: bool
         required: false
+      "script_param":
+        type: map
+        required: false
+        mapping:
+          "pre_script_timeout":
+            type: int
+            required: false
+          "post_script_timeout":
+            type: int
+            required: false
+          "post_flash_timeout":
+            type: int
+            required: false
diff --git a/scripts/tests/twister/test_hardwaremap.py b/scripts/tests/twister/test_hardwaremap.py
@@ -59,7 +59,12 @@ def mocked_hm():
             'post_flash_script': 'dummy post flash script',
             'runner': 'dummy runner',
             'flash_timeout': 30,
-            'flash_with_test': True
+            'flash_with_test': True,
+            'script_param': {
+                'pre_script_timeout' : 30,
+                'post_flash_timeout' : 30,
+                'post_script_timeout' : 30,
+                }
         },
         {
             'lock': mock.ANY,
@@ -76,7 +81,12 @@ def mocked_hm():
             'post_flash_script': 'dummy post flash script',
             'runner': 'dummy runner',
             'flash_timeout': 30,
-            'flash_with_test': True
+            'flash_with_test': True,
+            'script_param': {
+                'pre_script_timeout' : 30,
+                'post_flash_timeout' : 30,
+                'post_script_timeout' : 30,
+                }
         },
         '<dummy platform (dummy product) on dummy serial>'
     ),