Split component_ut tests based on targets

- add more label in CIScanTest.py
- fix the bug that will cause labels not iterate correctly
This commit is contained in:
Fu Hanxi
2020-11-30 11:45:16 +08:00
parent 6fd2d27bfd
commit 7281a5a0cc
2 changed files with 17 additions and 6 deletions

View File

@@ -72,6 +72,16 @@
# run test # run test
- python Runner.py $COMPONENT_UT_DIRS -c $CONFIG_FILE -e $ENV_FILE - python Runner.py $COMPONENT_UT_DIRS -c $CONFIG_FILE -e $ENV_FILE
.component_ut_32_template:
extends:
- .component_ut_template
- .rules:tests:unit_test_32
.component_ut_s2_template: # unused yet
extends:
- .component_ut_template
- .rules:tests:unit_test_s2
.unit_test_template: .unit_test_template:
extends: extends:
- .target_test_job_template - .target_test_job_template
@@ -336,7 +346,7 @@ test_app_test_004:
- Example_GENERIC - Example_GENERIC
component_ut_test_001: component_ut_test_001:
extends: .component_ut_template extends: .component_ut_32_template
tags: tags:
- ESP32 - ESP32
- COMPONENT_UT_GENERIC - COMPONENT_UT_GENERIC

View File

@@ -13,7 +13,9 @@ from idf_py_actions.constants import SUPPORTED_TARGETS, PREVIEW_TARGETS
TEST_LABELS = { TEST_LABELS = {
'example_test': 'BOT_LABEL_EXAMPLE_TEST', 'example_test': 'BOT_LABEL_EXAMPLE_TEST',
'test_apps': 'BOT_LABEL_CUSTOM_TEST', 'test_apps': 'BOT_LABEL_CUSTOM_TEST',
'component_ut': ['BOT_LABEL_UNIT_TEST', 'BOT_LABEL_UNIT_TEST_S2'], 'component_ut': ['BOT_LABEL_UNIT_TEST',
'BOT_LABEL_UNIT_TEST_32',
'BOT_LABEL_UNIT_TEST_S2'],
} }
BUILD_ALL_LABELS = [ BUILD_ALL_LABELS = [
@@ -45,11 +47,10 @@ def _judge_build_or_not(action, build_all): # type: (str, bool) -> (bool, bool)
for label in labels: for label in labels:
if os.getenv(label): if os.getenv(label):
logging.info('Build test cases apps') logging.info('Build only test cases apps')
return True, False return True, False
else: logging.info('Skip all')
logging.info('Skip all') return False, False
return False, False
def output_json(apps_dict_list, target, build_system, output_dir): def output_json(apps_dict_list, target, build_system, output_dir):