Skip to content

Commit 928183b

Browse files
pabigotcarlescufi
authored andcommitted
tests: cbprintf: sanitize language
Replace SANITYCHECK flag with TWISTER. Signed-off-by: Peter Bigot <[email protected]>
1 parent 577cd82 commit 928183b

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

tests/unit/cbprintf/main.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
#include <sys/util.h>
1818

1919
/* Unit testing doesn't use Kconfig, so if we're not building from
20-
* sanitycheck force selection of all features. If we are use flags
21-
* to determine which features are desired. Yes, this is a mess.
20+
* twister force selection of all features. If we are use flags to
21+
* determine which features are desired. Yes, this is a mess.
2222
*/
23-
#ifndef VIA_SANITYCHECK
23+
#ifndef VIA_TWISTER
2424
/* Set this to truthy to use libc's snprintf as external validation.
2525
* This should be used with all options enabled.
2626
*/
@@ -58,34 +58,34 @@
5858
#define CONFIG_CBPRINTF_REDUCED_INTEGRAL 1
5959
#endif
6060

61-
#else /* VIA_SANITYCHECK */
62-
#if (VIA_SANITYCHECK & 0x01) != 0
61+
#else /* VIA_TWISTER */
62+
#if (VIA_TWISTER & 0x01) != 0
6363
#define CONFIG_CBPRINTF_FULL_INTEGRAL 1
6464
#else
6565
#define CONFIG_CBPRINTF_REDUCED_INTEGRAL 1
6666
#endif
67-
#if (VIA_SANITYCHECK & 0x02) != 0
67+
#if (VIA_TWISTER & 0x02) != 0
6868
#define CONFIG_CBPRINTF_FP_SUPPORT 1
6969
#endif
70-
#if (VIA_SANITYCHECK & 0x04) != 0
70+
#if (VIA_TWISTER & 0x04) != 0
7171
#define CONFIG_CBPRINTF_FP_A_SUPPORT 1
7272
#endif
73-
#if (VIA_SANITYCHECK & 0x08) != 0
73+
#if (VIA_TWISTER & 0x08) != 0
7474
#define CONFIG_CBPRINTF_N_SPECIFIER 1
7575
#endif
76-
#if (VIA_SANITYCHECK & 0x40) != 0
76+
#if (VIA_TWISTER & 0x40) != 0
7777
#define CONFIG_CBPRINTF_FP_ALWAYS_A 1
7878
#endif
79-
#if (VIA_SANITYCHECK & 0x80) != 0
79+
#if (VIA_TWISTER & 0x80) != 0
8080
#define CONFIG_CBPRINTF_NANO 1
8181
#else /* 0x80 */
8282
#define CONFIG_CBPRINTF_COMPLETE 1
8383
#endif /* 0x80 */
84-
#if (VIA_SANITYCHECK & 0x100) != 0
84+
#if (VIA_TWISTER & 0x100) != 0
8585
#define CONFIG_CBPRINTF_LIBC_SUBSTS 1
8686
#endif
8787

88-
#endif /* VIA_SANITYCHECK */
88+
#endif /* VIA_TWISTER */
8989

9090
#include "../../../lib/os/cbprintf.c"
9191

tests/unit/cbprintf/testcase.yaml

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,49 +4,49 @@ common:
44

55
tests:
66
utilities.prf.m32v00: # REDUCED
7-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x00
7+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x00
88

99
utilities.prf.m32v01: # FULL
10-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x01
10+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x01
1111

1212
utilities.prf.m32v02: # REDUCED + FP
13-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x02
13+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x02
1414

1515
utilities.prf.m32v03: # FULL + FP
16-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x03
16+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x03
1717

1818
utilities.prf.m32v07: # FULL + FP + FP_A
19-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x07
19+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x07
2020

2121
utilities.prf.m32v08: # %n
22-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x08
22+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x08
2323

2424
utilities.prf.m32v80: # NANO
25-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x80
25+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x80
2626

2727
utilities.prf.m32v101: # FULL + LIBC
28-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x101
28+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x101
2929

3030
utilities.prf.m32v181: # NANO + FULL + LIBC
31-
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x181
31+
extra_args: M64_MODE=0 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x181
3232

3333
utilities.prf.m64v00: # m64
34-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x00
34+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x00
3535

3636
utilities.prf.m64v01: # m64 FULL
37-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x01
37+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x01
3838

3939
utilities.prf.m64v03: # m64 FULL & FP
40-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x03
40+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x03
4141

4242
utilities.prf.m64v17: # m64 FULL & FP & FP_A
43-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x07
43+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x07
4444

4545
utilities.prf.m64v80: # NANO
46-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x80
46+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x80
4747

4848
utilities.prf.m64v101: # FULL + LIBC
49-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x101
49+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x101
5050

5151
utilities.prf.m64v181: # NANO + FULL + LIBC
52-
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_SANITYCHECK=0x181
52+
extra_args: M64_MODE=1 EXTRA_CPPFLAGS=-DVIA_TWISTER=0x181

0 commit comments

Comments
 (0)