tests: lib: cbprintf: Extended to test C++
Extended test suite to be run for C++ Signed-off-by: Krzysztof Chruscinski <krzysztof.chruscinski@nordicsemi.no>
This commit is contained in:
Krzysztof Chruscinski
Anas Nashif
parent
6f227698bb
commit
61a2e8cee3
4 changed files with 174 additions and 139 deletions
|
|
@ -4,5 +4,4 @@ cmake_minimum_required(VERSION 3.13.1)
|
|||
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
|
||||
project(cbprintf_package)
|
||||
|
||||
FILE(GLOB app_sources src/*.c)
|
||||
target_sources(app PRIVATE ${app_sources})
|
||||
target_sources(app PRIVATE src/main.c src/maincxx.cxx)
|
||||
|
|
|
|||
|
|
@ -3,147 +3,16 @@
|
|||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <ztest.h>
|
||||
#include <sys/cbprintf.h>
|
||||
#include <string.h>
|
||||
|
||||
#define CBPRINTF_DEBUG 1
|
||||
#include "test.inc"
|
||||
|
||||
#ifndef CBPRINTF_PACKAGE_ALIGN_OFFSET
|
||||
#define CBPRINTF_PACKAGE_ALIGN_OFFSET 0
|
||||
#endif
|
||||
|
||||
#define ALIGN_OFFSET (sizeof(void *) * CBPRINTF_PACKAGE_ALIGN_OFFSET)
|
||||
|
||||
struct out_buffer {
|
||||
char *buf;
|
||||
size_t idx;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
static int out(int c, void *dest)
|
||||
{
|
||||
int rv = EOF;
|
||||
struct out_buffer *buf = dest;
|
||||
|
||||
if (buf->idx < buf->size) {
|
||||
buf->buf[buf->idx++] = (char)(unsigned char)c;
|
||||
rv = (int)(unsigned char)c;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
static char static_buf[512];
|
||||
static char runtime_buf[512];
|
||||
static char compare_buf[128];
|
||||
|
||||
void dump(const char *desc, uint8_t *package, size_t len)
|
||||
{
|
||||
printk("%s package %p:\n", desc, package);
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
printk("%02x ", package[i]);
|
||||
}
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
void unpack(const char *desc, struct out_buffer *buf,
|
||||
uint8_t *package, size_t len)
|
||||
{
|
||||
cbpprintf(out, buf, package);
|
||||
buf->buf[buf->idx] = 0;
|
||||
zassert_equal(strcmp(buf->buf, compare_buf), 0,
|
||||
"Strings differ\nexp: |%s|\ngot: |%s|\n",
|
||||
compare_buf, buf->buf);
|
||||
}
|
||||
|
||||
#define TEST_PACKAGING(fmt, ...) do { \
|
||||
snprintf(compare_buf, sizeof(compare_buf), fmt, __VA_ARGS__); \
|
||||
printk("-----------------------------------------\n"); \
|
||||
printk("%s\n", compare_buf); \
|
||||
uint8_t *pkg; \
|
||||
struct out_buffer rt_buf = { \
|
||||
.buf = runtime_buf, .idx = 0, .size = sizeof(runtime_buf) \
|
||||
}; \
|
||||
int rc = cbprintf_package(NULL, ALIGN_OFFSET, fmt, __VA_ARGS__); \
|
||||
zassert_true(rc > 0, "cbprintf_package() returned %d", rc); \
|
||||
int len = rc; \
|
||||
/* Aligned so the package is similar to the static one. */ \
|
||||
uint8_t __aligned(CBPRINTF_PACKAGE_ALIGNMENT) \
|
||||
rt_package[len + ALIGN_OFFSET]; \
|
||||
memset(rt_package, 0, len + ALIGN_OFFSET); \
|
||||
pkg = &rt_package[ALIGN_OFFSET]; \
|
||||
rc = cbprintf_package(pkg, len, fmt, __VA_ARGS__); \
|
||||
zassert_equal(rc, len, "cbprintf_package() returned %d, expected %d", \
|
||||
rc, len); \
|
||||
dump("runtime", pkg, len); \
|
||||
unpack("runtime", &rt_buf, pkg, len); \
|
||||
\
|
||||
struct out_buffer st_buf = { \
|
||||
.buf = static_buf, .idx = 0, .size = sizeof(static_buf) \
|
||||
}; \
|
||||
CBPRINTF_STATIC_PACKAGE(NULL, 0, len, ALIGN_OFFSET, fmt, __VA_ARGS__); \
|
||||
zassert_true(len > 0, "CBPRINTF_STATIC_PACKAGE() returned %d", len); \
|
||||
uint8_t __aligned(CBPRINTF_PACKAGE_ALIGNMENT) \
|
||||
package[len + ALIGN_OFFSET];\
|
||||
int outlen; \
|
||||
pkg = &package[ALIGN_OFFSET]; \
|
||||
CBPRINTF_STATIC_PACKAGE(pkg, len, outlen, ALIGN_OFFSET, fmt, __VA_ARGS__);\
|
||||
zassert_equal(len, outlen, NULL); \
|
||||
dump("static", pkg, len); \
|
||||
unpack("static", &st_buf, pkg, len); \
|
||||
} while (0)
|
||||
|
||||
void test_cbprintf_package(void)
|
||||
{
|
||||
volatile signed char sc = -11;
|
||||
int i = 100;
|
||||
char c = 'a';
|
||||
static const short s = -300;
|
||||
long li = -1111111111;
|
||||
long long lli = 0x1122334455667788;
|
||||
unsigned char uc = 100;
|
||||
unsigned int ui = 0x12345;
|
||||
unsigned short us = 0x1234;
|
||||
unsigned long ul = 0xaabbaabb;
|
||||
unsigned long long ull = 0xaabbaabbaabb;
|
||||
float f = -1.234;
|
||||
double d = 1.2333;
|
||||
|
||||
/* tests to exercize different element alignments */
|
||||
TEST_PACKAGING("test long %x %lx %x", 0xb1b2b3b4, li, 0xe4e3e2e1);
|
||||
TEST_PACKAGING("test long long %x %llx %x", 0xb1b2b3b4, lli, 0xe4e3e2e1);
|
||||
if (IS_ENABLED(CONFIG_CBPRINTF_FP_SUPPORT)) {
|
||||
TEST_PACKAGING("test double %x %f %x", 0xb1b2b3b4, d, 0xe4e3e2e1);
|
||||
}
|
||||
|
||||
/* tests with varied elements */
|
||||
TEST_PACKAGING("test %d %hd %hhd", i, s, sc);
|
||||
TEST_PACKAGING("test %ld %llx %hhu %hu %u", li, lli, uc, us, ui);
|
||||
TEST_PACKAGING("test %lu %llu", ul, ull);
|
||||
TEST_PACKAGING("test %c %p", c, &c);
|
||||
if (IS_ENABLED(CONFIG_CBPRINTF_FP_SUPPORT)) {
|
||||
TEST_PACKAGING("test %f %a", f, d);
|
||||
#if CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE
|
||||
long double ld = 1.2333;
|
||||
|
||||
TEST_PACKAGING("test %Lf", ld);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
void test_cxx(void);
|
||||
void test_cc(void);
|
||||
|
||||
void test_main(void)
|
||||
{
|
||||
printk("sizeof: int=%zu long=%zu ptr=%zu long long=%zu double=%zu long double=%zu\n",
|
||||
sizeof(int), sizeof(long), sizeof(void *), sizeof(long long),
|
||||
sizeof(double), sizeof(long double));
|
||||
printk("alignof: int=%zu long=%zu ptr=%zu long long=%zu double=%zu long double=%zu\n",
|
||||
__alignof__(int), __alignof__(long), __alignof__(void *),
|
||||
__alignof__(long long), __alignof__(double), __alignof__(long double));
|
||||
printk("%s C11 _Generic\n", Z_C_GENERIC ? "With" : "Without");
|
||||
|
||||
ztest_test_suite(cbprintf_package,
|
||||
ztest_unit_test(test_cbprintf_package)
|
||||
);
|
||||
|
||||
ztest_run_test_suite(cbprintf_package);
|
||||
test_cc();
|
||||
test_cxx();
|
||||
}
|
||||
|
|
|
|||
9
tests/lib/cbprintf_package/src/maincxx.cxx
Normal file
9
tests/lib/cbprintf_package/src/maincxx.cxx
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
/*
|
||||
* Copyright (c) 2021 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include <ztest.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "test.inc"
|
||||
158
tests/lib/cbprintf_package/src/test.inc
Normal file
158
tests/lib/cbprintf_package/src/test.inc
Normal file
|
|
@ -0,0 +1,158 @@
|
|||
/*
|
||||
* Copyright (c) 2021 Nordic Semiconductor ASA
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <ztest.h>
|
||||
#include <sys/cbprintf.h>
|
||||
|
||||
#define CBPRINTF_DEBUG 1
|
||||
|
||||
#ifndef CBPRINTF_PACKAGE_ALIGN_OFFSET
|
||||
#define CBPRINTF_PACKAGE_ALIGN_OFFSET 0
|
||||
#endif
|
||||
|
||||
#define ALIGN_OFFSET (sizeof(void *) * CBPRINTF_PACKAGE_ALIGN_OFFSET)
|
||||
|
||||
struct out_buffer {
|
||||
char *buf;
|
||||
size_t idx;
|
||||
size_t size;
|
||||
};
|
||||
|
||||
static int out(int c, void *dest)
|
||||
{
|
||||
int rv = EOF;
|
||||
struct out_buffer *buf = (struct out_buffer *)dest;
|
||||
|
||||
if (buf->idx < buf->size) {
|
||||
buf->buf[buf->idx++] = (char)(unsigned char)c;
|
||||
rv = (int)(unsigned char)c;
|
||||
}
|
||||
return rv;
|
||||
}
|
||||
|
||||
static char static_buf[512];
|
||||
static char runtime_buf[512];
|
||||
static char compare_buf[128];
|
||||
|
||||
void dump(const char *desc, uint8_t *package, size_t len)
|
||||
{
|
||||
printk("%s package %p:\n", desc, package);
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
printk("%02x ", package[i]);
|
||||
}
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
void unpack(const char *desc, struct out_buffer *buf,
|
||||
uint8_t *package, size_t len)
|
||||
{
|
||||
cbpprintf((cbprintf_cb)out, buf, package);
|
||||
buf->buf[buf->idx] = 0;
|
||||
zassert_equal(strcmp(buf->buf, compare_buf), 0,
|
||||
"Strings differ\nexp: |%s|\ngot: |%s|\n",
|
||||
compare_buf, buf->buf);
|
||||
}
|
||||
|
||||
#define TEST_PACKAGING(fmt, ...) do { \
|
||||
snprintf(compare_buf, sizeof(compare_buf), fmt, __VA_ARGS__); \
|
||||
printk("-----------------------------------------\n"); \
|
||||
printk("%s\n", compare_buf); \
|
||||
uint8_t *pkg; \
|
||||
struct out_buffer rt_buf = { \
|
||||
.buf = runtime_buf, .idx = 0, .size = sizeof(runtime_buf) \
|
||||
}; \
|
||||
int rc = cbprintf_package(NULL, ALIGN_OFFSET, fmt, __VA_ARGS__); \
|
||||
zassert_true(rc > 0, "cbprintf_package() returned %d", rc); \
|
||||
int len = rc; \
|
||||
/* Aligned so the package is similar to the static one. */ \
|
||||
uint8_t __aligned(CBPRINTF_PACKAGE_ALIGNMENT) \
|
||||
rt_package[len + ALIGN_OFFSET]; \
|
||||
memset(rt_package, 0, len + ALIGN_OFFSET); \
|
||||
pkg = &rt_package[ALIGN_OFFSET]; \
|
||||
rc = cbprintf_package(pkg, len, fmt, __VA_ARGS__); \
|
||||
zassert_equal(rc, len, "cbprintf_package() returned %d, expected %d", \
|
||||
rc, len); \
|
||||
dump("runtime", pkg, len); \
|
||||
unpack("runtime", &rt_buf, pkg, len); \
|
||||
struct out_buffer st_buf = { \
|
||||
.buf = static_buf, .idx = 0, .size = sizeof(static_buf) \
|
||||
}; \
|
||||
CBPRINTF_STATIC_PACKAGE(NULL, 0, len, ALIGN_OFFSET, fmt, __VA_ARGS__); \
|
||||
zassert_true(len > 0, "CBPRINTF_STATIC_PACKAGE() returned %d", len); \
|
||||
uint8_t __aligned(CBPRINTF_PACKAGE_ALIGNMENT) \
|
||||
package[len + ALIGN_OFFSET];\
|
||||
int outlen; \
|
||||
pkg = &package[ALIGN_OFFSET]; \
|
||||
CBPRINTF_STATIC_PACKAGE(pkg, len, outlen, ALIGN_OFFSET, fmt, __VA_ARGS__);\
|
||||
zassert_equal(len, outlen, NULL); \
|
||||
dump("static", pkg, len); \
|
||||
unpack("static", &st_buf, pkg, len); \
|
||||
} while (0)
|
||||
|
||||
void test_cbprintf_package(void)
|
||||
{
|
||||
volatile signed char sc = -11;
|
||||
int i = 100;
|
||||
char c = 'a';
|
||||
static const short s = -300;
|
||||
long li = -1111111111;
|
||||
long long lli = 0x1122334455667788;
|
||||
unsigned char uc = 100;
|
||||
unsigned int ui = 0x12345;
|
||||
unsigned short us = 0x1234;
|
||||
unsigned long ul = 0xaabbaabb;
|
||||
unsigned long long ull = 0xaabbaabbaabb;
|
||||
|
||||
|
||||
/* tests to exercize different element alignments */
|
||||
TEST_PACKAGING("test long %x %lx %x", 0xb1b2b3b4, li, 0xe4e3e2e1);
|
||||
TEST_PACKAGING("test long long %x %llx %x", 0xb1b2b3b4, lli, 0xe4e3e2e1);
|
||||
|
||||
/* tests with varied elements */
|
||||
TEST_PACKAGING("test %d %hd %hhd", i, s, sc);
|
||||
TEST_PACKAGING("test %ld %llx %hhu %hu %u", li, lli, uc, us, ui);
|
||||
TEST_PACKAGING("test %lu %llu", ul, ull);
|
||||
TEST_PACKAGING("test %c %p", c, &c);
|
||||
|
||||
if (IS_ENABLED(CONFIG_CBPRINTF_FP_SUPPORT)) {
|
||||
float f = -1.234;
|
||||
double d = 1.2333;
|
||||
|
||||
TEST_PACKAGING("test double %x %f %x", 0xb1b2b3b4, d, 0xe4e3e2e1);
|
||||
TEST_PACKAGING("test %f %a", f, d);
|
||||
#if CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE
|
||||
long double ld = 1.2333;
|
||||
|
||||
TEST_PACKAGING("test %Lf", ld);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#if __cplusplus
|
||||
extern "C" void test_cxx(void);
|
||||
void test_cxx(void)
|
||||
#else
|
||||
void test_cc(void)
|
||||
#endif
|
||||
{
|
||||
#ifdef __cplusplus
|
||||
printk("C++\n");
|
||||
#else
|
||||
printk("sizeof: int=%zu long=%zu ptr=%zu long long=%zu double=%zu long double=%zu\n",
|
||||
sizeof(int), sizeof(long), sizeof(void *), sizeof(long long),
|
||||
sizeof(double), sizeof(long double));
|
||||
printk("alignof: int=%zu long=%zu ptr=%zu long long=%zu double=%zu long double=%zu\n",
|
||||
__alignof__(int), __alignof__(long), __alignof__(void *),
|
||||
__alignof__(long long), __alignof__(double), __alignof__(long double));
|
||||
printk("%s C11 _Generic\n", Z_C_GENERIC ? "With" : "Without");
|
||||
#endif
|
||||
|
||||
ztest_test_suite(cbprintf_package,
|
||||
ztest_unit_test(test_cbprintf_package)
|
||||
);
|
||||
|
||||
ztest_run_test_suite(cbprintf_package);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue