From 855cc9155083e02d436a16be98dc43e1590ebfff Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Mon, 27 Jun 2016 16:01:52 -0500 Subject: [PATCH] Force program_cycle_s to be used as an attribue everywhere --- tools/make.py | 2 +- tools/targets.py | 1 + tools/test_api.py | 3 +-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/make.py b/tools/make.py index 7bc749985e2..200a2b336a8 100644 --- a/tools/make.py +++ b/tools/make.py @@ -283,7 +283,7 @@ # Import pyserial: https://pypi.python.org/pypi/pyserial from serial import Serial - sleep(TARGET_MAP[mcu].program_cycle_s()) + sleep(TARGET_MAP[mcu].program_cycle_s) serial = Serial(options.serial, timeout = 1) if options.baud: diff --git a/tools/targets.py b/tools/targets.py index e29b5c34bf0..953523f6c7d 100644 --- a/tools/targets.py +++ b/tools/targets.py @@ -215,6 +215,7 @@ def __init__(self, name): # Create also a list with only the names of the targets in the resolution order self.resolution_order_names = [t[0] for t in self.resolution_order] + @property def program_cycle_s(self): try: return self.__getattr__("program_cycle_s") diff --git a/tools/test_api.py b/tools/test_api.py index 745bce563f9..5c97a025996 100644 --- a/tools/test_api.py +++ b/tools/test_api.py @@ -898,7 +898,7 @@ def handle_mut(self, mut, data, target_name, toolchain_name, test_loops=1): reset=host_test_reset, reset_tout=reset_tout, copy_method=selected_copy_method, - program_cycle_s=target_by_mcu.program_cycle_s()) + program_cycle_s=target_by_mcu.program_cycle_s) single_test_result, single_test_output, single_testduration, single_timeout = host_test_result # Store test result @@ -2083,4 +2083,3 @@ def test_spec_from_test_builds(test_builds): return { "builds": test_builds } - \ No newline at end of file