Skip to content

Commit d43e1cd

Browse files
erhankurerhankur
committed
esp/testing: fix idf version check
1 parent 15bb5fd commit d43e1cd

File tree

2 files changed

+19
-27
lines changed

2 files changed

+19
-27
lines changed

‎testing/esp/test_bp.py

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,11 @@ class WatchpointTestsImpl:
197197
""" Watchpoints test cases which are common for dual and single core modes
198198
"""
199199

200+
wp_stop_reason = [dbg.TARGET_STOP_REASON_SIGTRAP, dbg.TARGET_STOP_REASON_WP]
201+
compare_offset = 0
202+
if testee_info.arch == "xtensa" or testee_info.idf_ver == IdfVersion.fromstr('latest'):
203+
compare_offset = 1
204+
200205
def test_wp_simple(self):
201206
"""
202207
This simple test checks general watchpoints usage scenario.
@@ -213,23 +218,19 @@ def test_wp_simple(self):
213218
for e in self.wps:
214219
self.add_wp(e, 'rw')
215220
cnt = 0
216-
wp_stop_reason = [dbg.TARGET_STOP_REASON_SIGTRAP, dbg.TARGET_STOP_REASON_WP]
217221
for i in range(3):
218222
# 'count' read
219-
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count10'])
223+
self.run_to_bp_and_check(self.wp_stop_reason, 'blink_task', ['s_count10'])
220224
var_val = int(self.gdb.data_eval_expr('s_count1'))
221225
self.assertEqual(var_val, cnt)
222226
# 'count' read
223-
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count11'])
227+
self.run_to_bp_and_check(self.wp_stop_reason, 'blink_task', ['s_count11'])
224228
var_val = int(self.gdb.data_eval_expr('s_count1'))
225229
self.assertEqual(var_val, cnt)
226230
# 'count' write
227-
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count11'])
231+
self.run_to_bp_and_check(self.wp_stop_reason, 'blink_task', ['s_count11'])
228232
var_val = int(self.gdb.data_eval_expr('s_count1'))
229-
if testee_info.arch == "xtensa" or testee_info.idf_ver > IdfVersion.fromstr('5.0'):
230-
self.assertEqual(var_val, cnt+1)
231-
else:
232-
self.assertEqual(var_val, cnt)
233+
self.assertEqual(var_val, cnt+self.compare_offset)
233234
cnt += 1
234235

235236
def test_wp_and_reconnect(self):
@@ -251,25 +252,16 @@ def test_wp_and_reconnect(self):
251252
cnt2 = 100
252253
for e in self.wps:
253254
self.add_wp(e, 'w')
254-
wp_stop_reason = [dbg.TARGET_STOP_REASON_SIGTRAP]
255-
if testee_info.idf_ver >= IdfVersion.fromstr('5.1'):
256-
wp_stop_reason.append(dbg.TARGET_STOP_REASON_WP)
257255
for i in range(5):
258256
if (i % 2) == 0:
259-
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count11'])
257+
self.run_to_bp_and_check(self.wp_stop_reason, 'blink_task', ['s_count11'])
260258
var_val = int(self.gdb.data_eval_expr('s_count1'))
261-
if testee_info.arch == "xtensa" or testee_info.idf_ver > IdfVersion.fromstr('5.0'):
262-
self.assertEqual(var_val, cnt+1)
263-
else:
264-
self.assertEqual(var_val, cnt)
259+
self.assertEqual(var_val, cnt+self.compare_offset)
265260
cnt += 1
266261
else:
267-
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count2'])
262+
self.run_to_bp_and_check(self.wp_stop_reason, 'blink_task', ['s_count2'])
268263
var_val = int(self.gdb.data_eval_expr('s_count2'))
269-
if testee_info.arch == "xtensa" or testee_info.idf_ver > IdfVersion.fromstr('5.0'):
270-
self.assertEqual(var_val, cnt2-1)
271-
else:
272-
self.assertEqual(var_val, cnt2)
264+
self.assertEqual(var_val, cnt2-self.compare_offset)
273265
cnt2 -= 1
274266
self.gdb.disconnect()
275267
sleep(0.1) #sleep 100ms
@@ -324,7 +316,7 @@ def two_cores_concurrently_hit_wps(self):
324316
for e in self.wps:
325317
self.add_wp(e, 'w')
326318
wp_stop_reason = [dbg.TARGET_STOP_REASON_SIGTRAP]
327-
if testee_info.idf_ver >= IdfVersion.fromstr('5.1'):
319+
if testee_info.arch == "xtensa" or testee_info.idf_ver == IdfVersion.fromstr('latest'):
328320
wp_stop_reason.append(dbg.TARGET_STOP_REASON_WP)
329321
for i in range(10):
330322
self.run_to_bp_and_check(wp_stop_reason, 'blink_task', ['s_count11', 's_count2'])

‎testing/esp/test_gcov.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def __init__(self, toolchain, path, src_dirs, proj_path, build_path=''):
103103
out = subprocess.check_output(['%sgcov' % toolchain, '-j', path], stderr=subprocess.STDOUT)
104104
get_logger().debug('GCOV: %s', out)
105105
#TODO check toolchain version, not IDF
106-
if testee_info.idf_ver == IdfVersion.fromstr('5.0'):
106+
if testee_info.idf_ver < IdfVersion.fromstr('latest'):
107107
gcov_gz_file = file_name
108108
else:
109109
gcov_gz_file = os.path.splitext(file_name)[0] # remove .gcda extension.
@@ -223,7 +223,7 @@ def setUp(self):
223223
# TODO check toolchain version, not IDF
224224
if testee_info.idf_ver < IdfVersion.fromstr('5.0'):
225225
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.gcda.gcov')
226-
elif testee_info.idf_ver == IdfVersion.fromstr('5.0'):
226+
elif testee_info.idf_ver < IdfVersion.fromstr('latest'):
227227
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.c.gcda.gcov.json')
228228
else:
229229
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.c.gcov.json')
@@ -241,7 +241,7 @@ def setUp(self):
241241
data_path = os.path.join(self.test_app_cfg.build_obj_dir(), 'esp-idf', 'main', 'CMakeFiles', MAIN_COMP_BUILD_DIR_NAME, 'helper_funcs.c.gcda')
242242
if testee_info.idf_ver < IdfVersion.fromstr('5.0'):
243243
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.gcda.gcov')
244-
elif testee_info.idf_ver == IdfVersion.fromstr('5.0'):
244+
elif testee_info.idf_ver < IdfVersion.fromstr('latest'):
245245
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.c.gcda.gcov.json')
246246
else:
247247
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.c.gcov.json')
@@ -336,7 +336,7 @@ def test_simple_oocd(self):
336336
data_path = os.path.join(self.test_app_cfg.build_obj_dir(), 'esp-idf', 'main', 'CMakeFiles', MAIN_COMP_BUILD_DIR_NAME, 'gcov_tests.c.gcda')
337337
if testee_info.idf_ver < IdfVersion.fromstr('5.0'):
338338
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.gcda.gcov')
339-
elif testee_info.idf_ver == IdfVersion.fromstr('5.0'):
339+
elif testee_info.idf_ver < IdfVersion.fromstr('latest'):
340340
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.c.gcda.gcov.json')
341341
else:
342342
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'gcov_tests.c.gcov.json')
@@ -347,7 +347,7 @@ def test_simple_oocd(self):
347347
data_path = os.path.join(self.test_app_cfg.build_obj_dir(), 'esp-idf', 'main', 'CMakeFiles', MAIN_COMP_BUILD_DIR_NAME, 'helper_funcs.c.gcda')
348348
if testee_info.idf_ver < IdfVersion.fromstr('5.0'):
349349
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.gcda.gcov')
350-
elif testee_info.idf_ver == IdfVersion.fromstr('5.0'):
350+
elif testee_info.idf_ver < IdfVersion.fromstr('latest'):
351351
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.c.gcda.gcov.json')
352352
else:
353353
ref_data_path = os.path.join(self.test_app_cfg.build_src_dir(), 'main', 'helper_funcs.c.gcov.json')

0 commit comments

Comments
 (0)