tools/test_apps: run tests which don't need JTAG on Example_GENERIC

This commit is contained in:
Ivan Grokhotkov
2020-06-16 21:06:36 +02:00
committed by Fu Hanxi
parent eda42035d2
commit e32885d699
3 changed files with 6 additions and 5 deletions

View File

@@ -315,7 +315,6 @@ example_test_016:
test_app_test_001: test_app_test_001:
extends: .test_app_template extends: .test_app_template
parallel: 4
tags: tags:
- ESP32 - ESP32
- test_jtag_arm - test_jtag_arm
@@ -324,7 +323,6 @@ test_app_test_001:
- $CI_PROJECT_DIR/tools/test_apps/system/*/*.log - $CI_PROJECT_DIR/tools/test_apps/system/*/*.log
variables: variables:
SETUP_TOOLS: "1" SETUP_TOOLS: "1"
PYTHON_VER: 3
test_app_test_002: test_app_test_002:
extends: .test_app_template extends: .test_app_template
@@ -340,9 +338,12 @@ test_app_test_003:
test_app_test_004: test_app_test_004:
extends: .test_app_template extends: .test_app_template
parallel: 4
tags: tags:
- ESP32S2 - ESP32
- Example_GENERIC - Example_GENERIC
variables:
SETUP_TOOLS: "1"
component_ut_test_001: component_ut_test_001:
extends: .component_ut_32_template extends: .component_ut_32_template

View File

@@ -252,7 +252,7 @@ def panic_test(**kwargs):
if 'additional_duts' not in kwargs: if 'additional_duts' not in kwargs:
kwargs['additional_duts'] = PANIC_TEST_DUT_DICT kwargs['additional_duts'] = PANIC_TEST_DUT_DICT
return ttfw_idf.idf_custom_test(app=PanicTestApp, env_tag="test_jtag_arm", **kwargs) return ttfw_idf.idf_custom_test(app=PanicTestApp, env_tag="Example_GENERIC", **kwargs)
def get_dut(env, app_config_name, test_name, qemu_wdt_enable=False): def get_dut(env, app_config_name, test_name, qemu_wdt_enable=False):

View File

@@ -6,7 +6,7 @@ import ttfw_idf
from tiny_test_fw import Utility from tiny_test_fw import Utility
@ttfw_idf.idf_custom_test(env_tag="test_jtag_arm", group="test-apps") @ttfw_idf.idf_custom_test(env_tag="Example_GENERIC", group="test-apps")
def test_startup(env, extra_data): def test_startup(env, extra_data):
config_files = glob.glob(os.path.join(os.path.dirname(__file__), "sdkconfig.ci.*")) config_files = glob.glob(os.path.join(os.path.dirname(__file__), "sdkconfig.ci.*"))
config_names = [os.path.basename(s).replace("sdkconfig.ci.", "") for s in config_files] config_names = [os.path.basename(s).replace("sdkconfig.ci.", "") for s in config_files]