michaelh/zephyr
1
0
Fork 0
Code Releases Activity

unit: cbprintf: Extended to test without _Generic use

Browse source 
Updated test and extended the configuration to valided packaging when
_Generic is not being used.

Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski 2021-03-11 15:22:26 +01:00 • committed by Anas Nashif
commit a02e11b118
2 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
tests/unit/cbprintf/main.c
View file

@ -14,7 +14,6 @@
#include <wctype.h> #include <wctype.h>
#include <stddef.h> #include <stddef.h>
#include <string.h> #include <string.h>
#include <sys/cbprintf.h>
#include <sys/util.h> #include <sys/util.h>
#define CBPRINTF_VIA_UNIT_TEST #define CBPRINTF_VIA_UNIT_TEST
@ -96,6 +95,9 @@
#if (VIA_TWISTER & 0x400) != 0 #if (VIA_TWISTER & 0x400) != 0
#define CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE 1 #define CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE 1
#endif #endif
#if (VIA_TWISTER & 0x800) != 0
#define AVOID_C_GENERIC 1
#endif
#endif /* VIA_TWISTER */ #endif /* VIA_TWISTER */
@ -114,6 +116,11 @@
#define ENABLED_USE_PACKAGED false #define ENABLED_USE_PACKAGED false
#endif #endif
#if AVOID_C_GENERIC
#define Z_C_GENERIC 0
#endif
#include <sys/cbprintf.h>
#include "../../../lib/os/cbprintf.c" #include "../../../lib/os/cbprintf.c"
#if defined(CONFIG_CBPRINTF_COMPLETE) #if defined(CONFIG_CBPRINTF_COMPLETE)
@ -1219,14 +1226,15 @@ void test_main(void)
} }
if (IS_ENABLED(CONFIG_CBPRINTF_COMPLETE)) { if (IS_ENABLED(CONFIG_CBPRINTF_COMPLETE)) {
TC_PRINT(" COMPLETE"); TC_PRINT(" COMPLETE");
if (ENABLED_USE_PACKAGED) {
TC_PRINT(" PACKAGED\n");
} else {
TC_PRINT(" VA_LIST\n");
}
} else { } else {
TC_PRINT(" NANO\n"); TC_PRINT(" NANO\n");
} }
if (ENABLED_USE_PACKAGED) {
TC_PRINT(" PACKAGED %s C11 _Generic\n",
Z_C_GENERIC ? "with" : "without");
} else {
TC_PRINT(" VA_LIST\n");
}
if (IS_ENABLED(CONFIG_CBPRINTF_FULL_INTEGRAL)) { if (IS_ENABLED(CONFIG_CBPRINTF_FULL_INTEGRAL)) {
TC_PRINT(" FULL_INTEGRAL\n"); TC_PRINT(" FULL_INTEGRAL\n");
} else { } else {

30
tests/unit/cbprintf/testcase.yaml
View file

@ -45,6 +45,21 @@ tests:
utilities.prf.m32v281: # PACKAGED NANO + FULL utilities.prf.m32v281: # PACKAGED NANO + FULL
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x281 extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x281
utilities.prf.m32va00: # PACKAGED REDUCED + AVOID_C_GENERIC
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa00
utilities.prf.m32va01: # PACKAGED FULL + AVOID_C_GENERIC
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa01
utilities.prf.m32va07: # PACKAGED FULL + FP + FP_A + AVOID_C_GENERIC
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa07
utilities.prf.m32va08: # PACKAGED %n + AVOID_C_GENERIC
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa08
utilities.prf.m32va81: # PACKAGED NANO + FULL + AVOID_C_GENERIC
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa81
utilities.prf.m64v00: # m64 utilities.prf.m64v00: # m64
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x00 extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x00
@ -95,3 +110,18 @@ tests:
utilities.prf.m64v681: # PACKAGED NANO + FULL + LONG_DOUBLE PACKAGING utilities.prf.m64v681: # PACKAGED NANO + FULL + LONG_DOUBLE PACKAGING
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x681 extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x681
utilities.prf.m64va00: # PACKAGED REDUCED + AVOID_C_GENERIC
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa00
utilities.prf.m64va01: # PACKAGED FULL + AVOID_C_GENERIC
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa01
utilities.prf.m64va07: # PACKAGED FULL + FP + FP_A + AVOID_C_GENERIC
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa07
utilities.prf.m64va08: # PACKAGED %n + AVOID_C_GENERIC
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa08
utilities.prf.m64va81: # PACKAGED NANO + FULL + AVOID_C_GENERIC
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0xa81