Skip to content

Commit 41fb993

Browse files
keith-packardstephanosio
authored andcommitted
tests/subsys/logging: Require a full C library
These tests all require a full C library to run. Replace the condition checking for either newlib or picolibc with a check for CONFIG_FULL_LIBC_SUPPORTED instead, then add CONFIG_REQUIRES_FULL_LIBC=y to ensure a full libc is used. Signed-off-by: Keith Packard <[email protected]>
1 parent 71255a2 commit 41fb993

File tree

2 files changed

+19
-11
lines changed

2 files changed

+19
-11
lines changed

tests/subsys/logging/log_switch_format/testcase.yaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,32 @@ tests:
1212
- sam_e70_xplained
1313
- qemu_cortex_a53
1414
extra_args: OVERLAY_CONFIG=overlay_deferred.conf
15-
# "TOOLCHAIN_HAS_NEWLIB == 1" filter was applied
15+
# "CONFIG_FULL_LIBC_SUPPORTED" filter was applied
1616
# because of following chain of dependencies:
1717
# LOG_MIPI_SYST_ENABLE=y --> CONFIG_MIPI_SYST_LIB --> \
18-
# --> REQUIRES_FULL_LIBC --> NEWLIB_LIBC.
18+
# --> REQUIRES_FULL_LIBC
1919
#
20-
# Not all compillers announced in Zephyr support NewLib.
21-
filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED
20+
# Not all compillers announced in Zephyr support a full C library
21+
filter: CONFIG_FULL_LIBC_SUPPORTED
22+
extra_configs:
23+
- CONFIG_REQUIRES_FULL_LIBC=y
2224
logging.log_switch_format.immediate:
2325
extra_args: OVERLAY_CONFIG=overlay_immediate.conf
2426
integration_platforms:
2527
- mps2_an385
2628
- qemu_x86
2729
- sam_e70_xplained
2830
- qemu_cortex_a53
29-
filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED
31+
filter: CONFIG_FULL_LIBC_SUPPORTED
32+
extra_configs:
33+
- CONFIG_REQUIRES_FULL_LIBC=y
3034
logging.log_switch_format.custom_output:
3135
extra_args: OVERLAY_CONFIG=overlay_custom_output.conf
3236
integration_platforms:
3337
- mps2_an385
3438
- qemu_x86
3539
- sam_e70_xplained
3640
- qemu_cortex_a53
37-
filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED
41+
filter: CONFIG_FULL_LIBC_SUPPORTED
42+
extra_configs:
43+
- CONFIG_REQUIRES_FULL_LIBC=y

tests/subsys/logging/log_syst/testcase.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,26 @@ tests:
44
logging.log_syst.mipi_syst:
55
tags: log_syst logging
66
arch_exclude: mips nios2 posix sparc
7-
# "TOOLCHAIN_HAS_NEWLIB == 1" filter was applied
7+
# "CONFIG_FULL_LIBC_SUPPORTED" filter was applied
88
# because of following chain of dependencies:
99
# LOG_MIPI_SYST_ENABLE=y --> CONFIG_MIPI_SYST_LIB --> \
10-
# --> REQUIRES_FULL_LIBC --> NEWLIB_LIBC.
10+
# --> REQUIRES_FULL_LIBC
1111
#
12-
# Not all compillers announced in Zephyr support NewLib.
13-
filter: TOOLCHAIN_HAS_NEWLIB == 1 or CONFIG_PICOLIBC_SUPPORTED
12+
# Not all compilers announced in Zephyr support full libc
13+
filter: CONFIG_FULL_LIBC_SUPPORTED
1414
integration_platforms:
1515
- mps2_an385
1616
- qemu_x86
1717
- sam_e70_xplained
1818
extra_configs:
1919
- CONFIG_LOG_MIPI_SYST_ENABLE=y
2020
- CONFIG_LOG_BACKEND_MOCK_OUTPUT_SYST=y
21+
- CONFIG_REQUIRES_FULL_LIBC=y
2122
logging.log_syst.text:
2223
tags: log_syst logging
2324
arch_exclude: mips nios2 posix sparc
24-
filter: TOOLCHAIN_HAS_NEWLIB == 1 or CONFIG_PICOLIBC_SUPPORTED
25+
filter: CONFIG_FULL_LIBC_SUPPORTED
2526
extra_configs:
2627
- CONFIG_LOG_MIPI_SYST_ENABLE=n
2728
- CONFIG_LOG_BACKEND_MOCK_OUTPUT_SYST=n
29+
- CONFIG_REQUIRES_FULL_LIBC=y

0 commit comments

Comments
 (0)