commit ee5418e9b71c70b74b9e26eb39248bcdee8e99c0
author Andrew Walbran <qwandor@google.com> Wed Nov 27 17:43:05 2019 +0000
committer Andrew Walbran <qwandor@google.com> Mon Dec 02 14:36:59 2019 +0000
tree c741da77d2014fea80c4ad501e90612452a1c8b0
parent d81c7d8fccacab9225168196d0caa9a55b787428

Support long running time limit for FVP.

Bug: 144477730
Change-Id: I0810a27fb7c4f501cf62c2becf2c8d2e77702b33

test/hftest/hftest.py

diff --git a/test/hftest/hftest.py b/test/hftest/hftest.py
index f160318..1c88953 100755
--- a/test/hftest/hftest.py
+++ b/test/hftest/hftest.py
@@ -286,10 +286,12 @@
             """.format(vm_args, initrd_start, initrd_end))
 
     def gen_fvp_args(
-            self, initrd_start, uart0_log_path, uart1_log_path, dtb_path):
+            self, is_long_running, initrd_start, uart0_log_path, uart1_log_path,
+            dtb_path):
         """Generate command line arguments for FVP."""
+        time_limit = "80s" if is_long_running else "40s"
         fvp_args = [
-            "timeout", "--foreground", "40s",
+            "timeout", "--foreground", time_limit,
             FVP_BINARY,
             "-C", "pctl.startup=0.0.0.0",
             "-C", "bp.secure_memory=0",
@@ -364,7 +366,8 @@
 
             # Run FVP.
             fvp_args = self.gen_fvp_args(
-                initrd_start, uart0_log_path, uart1_log_path, dtb_path)
+                is_long_running, initrd_start, uart0_log_path, uart1_log_path,
+                dtb_path)
             self.exec_logged(run_state, fvp_args)
         except DriverRunException:
             pass