espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 04:04:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add BOT_TARGET_FILTER to _apply_bot_filter

Browse Source 
fix the bug that will calculate twice if ci_target is a list.
This commit is contained in:
Fu Hanxi
2020-04-09 18:19:03 +08:00
parent bc026133c5
commit 38c288bc0e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/ci/python_packages/tiny_test_fw/Utility/CIAssignTest.py
View File

@@ -234,12 +234,11 @@ class AssignTest(object):
:return: filter for search test cases :return: filter for search test cases
""" """
bot_filter = os.getenv("BOT_CASE_FILTER") res = dict()
for bot_filter in [os.getenv('BOT_CASE_FILTER'), os.getenv('BOT_TARGET_FILTER')]:
if bot_filter: if bot_filter:
bot_filter = json.loads(bot_filter) res.update(json.loads(bot_filter))
else: return res
bot_filter = dict()
return bot_filter
def _apply_bot_test_count(self): def _apply_bot_test_count(self):
""" """

2
tools/ci/python_packages/tiny_test_fw/Utility/SearchCases.py
View File

@@ -79,6 +79,8 @@ class Search(object):
""" """
replicate_config = [] replicate_config = []
for key in case.case_info: for key in case.case_info:
if key == 'ci_target': # ci_target is used to filter target, should not be duplicated.
continue
if isinstance(case.case_info[key], (list, tuple)): if isinstance(case.case_info[key], (list, tuple)):
replicate_config.append(key) replicate_config.append(key)