From 5343aed00276c78d782c395b8dd481a11670e01e Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Thu, 6 May 2021 18:17:04 -0400 Subject: [PATCH] tests: fix testcase.yaml files Puts all filter in common section and fix filters. Platforms in integration_platforms must also be allowed first, otherwise the tests will never run. Signed-off-by: Anas Nashif --- tests/lib/cbprintf_package/testcase.yaml | 62 ++++------------- tests/subsys/logging/log_api/testcase.yaml | 68 ++----------------- .../logging/log_benchmark/testcase.yaml | 4 +- tests/subsys/logging/log_msg2/testcase.yaml | 40 ++--------- 4 files changed, 26 insertions(+), 148 deletions(-) diff --git a/tests/lib/cbprintf_package/testcase.yaml b/tests/lib/cbprintf_package/testcase.yaml index b6d97f46bbe..9026fa6d9b0 100644 --- a/tests/lib/cbprintf_package/testcase.yaml +++ b/tests/lib/cbprintf_package/testcase.yaml @@ -1,88 +1,52 @@ +common: + filter: CONFIG_QEMU_TARGET or CONFIG_BOARD_NATIVE_POSIX + tags: cbprintf + integration_platforms: + - native_posix tests: libraries.cbprintf_package: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa extra_configs: - CONFIG_CBPRINTF_COMPLETE=y libraries.cbprintf_package_no_generic: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_COMPILER_OPT="-DZ_C_GENERIC=0" libraries.cbprintf_package_fp: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 - qemu_x86_64 qemu_xtensa + filter: CONFIG_CPU_HAS_FPU extra_configs: - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y + - CONFIG_FPU=y libraries.cbprintf_package_fp_align_offset: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 - qemu_x86_64 + filter: CONFIG_CPU_HAS_FPU extra_configs: - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_COMPILER_OPT="-DCBPRINTF_PACKAGE_ALIGN_OFFSET=1" + - CONFIG_FPU=y libraries.cbprintf_package_long_double: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv64 - qemu_x86_64 qemu_xtensa + filter: CONFIG_CPU_HAS_FPU platform_exclude: qemu_riscv32 extra_configs: - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE=y + - CONFIG_FPU=y libraries.cbprintf_package_long_double_align_offset: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv64 - qemu_x86_64 + filter: CONFIG_CPU_HAS_FPU platform_exclude: qemu_riscv32 extra_configs: - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE=y - CONFIG_COMPILER_OPT="-DCBPRINTF_PACKAGE_ALIGN_OFFSET=1" + - CONFIG_FPU=y libraries.cbprintf_package_nano: - tags: cbprintf - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa extra_configs: - CONFIG_CBPRINTF_NANO=y diff --git a/tests/subsys/logging/log_api/testcase.yaml b/tests/subsys/logging/log_api/testcase.yaml index a1886412171..54eebf28f48 100644 --- a/tests/subsys/logging/log_api/testcase.yaml +++ b/tests/subsys/logging/log_api/testcase.yaml @@ -1,152 +1,96 @@ +common: + filter: CONFIG_QEMU_TARGET or CONFIG_BOARD_NATIVE_POSIX + tags: log_api logging + integration_platforms: + - native_posix tests: logging.log_api_deferred_overflow_rt_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - CONFIG_LOG_RUNTIME_FILTERING=y - logging.log_api_deferred_overflow: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - logging.log_api_deferred_no_overflow: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=n logging.log_api_deferred_static_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y logging.log_api_deferred_func_prefix: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y + - CONFIG_LOG_DETECT_MISSED_STRDUP=n logging.log_api_immediate: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y logging.log_api_immediate_rt_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_RUNTIME_FILTERING=y logging.log_api_immediate_static_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y logging.log2_api_deferred_overflow_rt_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - CONFIG_LOG_RUNTIME_FILTERING=y logging.log2_api_deferred_overflow: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y logging.log2_api_deferred_no_overflow: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=n logging.log2_api_deferred_static_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y logging.log2_api_deferred_func_prefix: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y logging.log2_api_deferred_64b_timestamp: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_DEFERRED=y - CONFIG_LOG_TIMESTAMP_64BIT=y logging.log2_api_immediate: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_IMMEDIATE=y logging.log2_api_immediate_rt_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_IMMEDIATE=y - CONFIG_LOG_RUNTIME_FILTERING=y logging.log2_api_immediate_static_filter: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_IMMEDIATE=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y logging.log2_api_immediate_64b_timestamp: - integration_platforms: - - native_posix - tags: log_api logging extra_configs: - CONFIG_LOG2_MODE_IMMEDIATE=y - CONFIG_LOG_TIMESTAMP_64BIT=y - -common: - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa diff --git a/tests/subsys/logging/log_benchmark/testcase.yaml b/tests/subsys/logging/log_benchmark/testcase.yaml index edd4f7075bc..892b233d9d5 100644 --- a/tests/subsys/logging/log_benchmark/testcase.yaml +++ b/tests/subsys/logging/log_benchmark/testcase.yaml @@ -13,7 +13,7 @@ tests: integration_platforms: - native_posix tags: logging - platform_allow: qemu_x86 + platform_allow: qemu_x86 native_posix extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_LOG_STRDUP_BUF_COUNT=8 @@ -42,7 +42,7 @@ tests: integration_platforms: - native_posix tags: logging - platform_allow: qemu_x86 + platform_allow: qemu_x86 native_posix extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_COMPLETE=y diff --git a/tests/subsys/logging/log_msg2/testcase.yaml b/tests/subsys/logging/log_msg2/testcase.yaml index 742d2deb964..3999a454c36 100644 --- a/tests/subsys/logging/log_msg2/testcase.yaml +++ b/tests/subsys/logging/log_msg2/testcase.yaml @@ -1,58 +1,28 @@ +common: + filter: CONFIG_QEMU_TARGET or CONFIG_BOARD_NATIVE_POSIX + tags: log_api logging + integration_platforms: + - native_posix tests: logging.log_msg2: - tags: log_msg2 logging - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa native_posix_64 extra_configs: - CONFIG_CBPRINTF_COMPLETE=y logging.log_msg2_no_overflow: - tags: log_msg2 logging - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa native_posix native_posix_64 extra_configs: - CONFIG_LOG_MODE_OVERFLOW=n logging.log_msg2_64b_timestamp: - tags: log_msg2 logging - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m0 qemu_cortex_m3 - qemu_cortex_r5 qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86 - qemu_x86_64 qemu_xtensa native_posix_64 extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_LOG_TIMESTAMP_64BIT=y logging.log_msg2_fp: - tags: log_msg2 logging - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m3 qemu_cortex_r5 - qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86_64 qemu_xtensa - native_posix_64 extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_FP_SUPPORT=y logging.log_msg2_fp_64b_timestamp: - tags: log_msg2 logging - integration_platforms: - - native_posix - platform_allow: > - qemu_arc_em qemu_arc_hs qemu_cortex_a53 qemu_cortex_m3 qemu_cortex_r5 - qemu_leon3 qemu_nios2 qemu_riscv32 qemu_riscv64 qemu_x86_64 qemu_xtensa - native_posix_64 extra_configs: - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_FP_SUPPORT=y