random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-17 22:28:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

test: fix naming of test functions in the log test suite

Browse Source 
Both the nolog as well as the syslog tests were not found by Python
function generate_ut_subtest() due to not following the nameing
requirements imposed by the regular expression used to find linker
generated list entries in file u-boot.sym.

Adjust the naming of test functions.

With the patch the following tests are executed successfully for
sandbox_defconfig:

test/py/tests/test_ut.py::test_ut[ut_log_syslog_debug] PASSED
test/py/tests/test_ut.py::test_ut[ut_log_syslog_err] PASSED
test/py/tests/test_ut.py::test_ut[ut_log_syslog_info] PASSED
test/py/tests/test_ut.py::test_ut[ut_log_syslog_nodebug] PASSED
test/py/tests/test_ut.py::test_ut[ut_log_syslog_notice] PASSED
test/py/tests/test_ut.py::test_ut[ut_log_syslog_warning] PASSED

The nolog tests are only executed if CONFIG_LOG=n and
CONFIG_CONSOLE_RECORD=y.

Reported-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Heinrich Schuchardt 2020-05-06 18:26:08 +02:00 committed by Tom Rini
parent d0ba026bd2
commit be51c3ca08
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
test/log/nolog_test.c
View File

@ -19,7 +19,7 @@ DECLARE_GLOBAL_DATA_PTR;
#define BUFFSIZE 32 #define BUFFSIZE 32
static int nolog_test_log_err(struct unit_test_state *uts) static int log_test_nolog_err(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -31,9 +31,9 @@ static int nolog_test_log_err(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_err); LOG_TEST(log_test_nolog_err);
static int nolog_test_log_warning(struct unit_test_state *uts) static int log_test_nolog_warning(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -45,9 +45,9 @@ static int nolog_test_log_warning(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_warning); LOG_TEST(log_test_nolog_warning);
static int nolog_test_log_notice(struct unit_test_state *uts) static int log_test_nolog_notice(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -59,9 +59,9 @@ static int nolog_test_log_notice(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_notice); LOG_TEST(log_test_nolog_notice);
static int nolog_test_log_info(struct unit_test_state *uts) static int log_test_nolog_info(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -73,7 +73,7 @@ static int nolog_test_log_info(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_info); LOG_TEST(log_test_nolog_info);
#undef _DEBUG #undef _DEBUG
#define _DEBUG 0 #define _DEBUG 0
@ -90,7 +90,7 @@ static int nolog_test_nodebug(struct unit_test_state *uts)
} }
LOG_TEST(nolog_test_nodebug); LOG_TEST(nolog_test_nodebug);
static int nolog_test_log_nodebug(struct unit_test_state *uts) static int log_test_nolog_nodebug(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -102,7 +102,7 @@ static int nolog_test_log_nodebug(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_nodebug); LOG_TEST(log_test_nolog_nodebug);
#undef _DEBUG #undef _DEBUG
#define _DEBUG 1 #define _DEBUG 1
@ -120,7 +120,7 @@ static int nolog_test_debug(struct unit_test_state *uts)
} }
LOG_TEST(nolog_test_debug); LOG_TEST(nolog_test_debug);
static int nolog_test_log_debug(struct unit_test_state *uts) static int log_test_nolog_debug(struct unit_test_state *uts)
{ {
char buf[BUFFSIZE]; char buf[BUFFSIZE];
@ -132,4 +132,4 @@ static int nolog_test_log_debug(struct unit_test_state *uts)
ut_assertok(ut_check_console_end(uts)); ut_assertok(ut_check_console_end(uts));
return 0; return 0;
} }
LOG_TEST(nolog_test_log_debug); LOG_TEST(log_test_nolog_debug);

48
test/log/syslog_test.c
View File

@ -92,12 +92,12 @@ static int sb_log_tx_handler(struct udevice *dev, void *packet,
} }
/** /**
* syslog_test_log_err() - test log_err() function * log_test_syslog_err() - test log_err() function
* *
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_err(struct unit_test_state *uts) static int log_test_syslog_err(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -106,7 +106,7 @@ static int syslog_test_log_err(struct unit_test_state *uts)
gd->default_log_level = LOGL_INFO; gd->default_log_level = LOGL_INFO;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<3>sandbox uboot: syslog_test_log_err() " env.expected = "<3>sandbox uboot: log_test_syslog_err() "
"testing log_err\n"; "testing log_err\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -119,15 +119,15 @@ static int syslog_test_log_err(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_err); LOG_TEST(log_test_syslog_err);
/** /**
* syslog_test_log_warning() - test log_warning() function * log_test_syslog_warning() - test log_warning() function
* *
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_warning(struct unit_test_state *uts) static int log_test_syslog_warning(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -136,7 +136,7 @@ static int syslog_test_log_warning(struct unit_test_state *uts)
gd->default_log_level = LOGL_INFO; gd->default_log_level = LOGL_INFO;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<4>sandbox uboot: syslog_test_log_warning() " env.expected = "<4>sandbox uboot: log_test_syslog_warning() "
"testing log_warning\n"; "testing log_warning\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -150,15 +150,15 @@ static int syslog_test_log_warning(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_warning); LOG_TEST(log_test_syslog_warning);
/** /**
* syslog_test_log_notice() - test log_notice() function * log_test_syslog_notice() - test log_notice() function
* *
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_notice(struct unit_test_state *uts) static int log_test_syslog_notice(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -167,7 +167,7 @@ static int syslog_test_log_notice(struct unit_test_state *uts)
gd->default_log_level = LOGL_INFO; gd->default_log_level = LOGL_INFO;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<5>sandbox uboot: syslog_test_log_notice() " env.expected = "<5>sandbox uboot: log_test_syslog_notice() "
"testing log_notice\n"; "testing log_notice\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -181,15 +181,15 @@ static int syslog_test_log_notice(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_notice); LOG_TEST(log_test_syslog_notice);
/** /**
* syslog_test_log_info() - test log_info() function * log_test_syslog_info() - test log_info() function
* *
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_info(struct unit_test_state *uts) static int log_test_syslog_info(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -198,7 +198,7 @@ static int syslog_test_log_info(struct unit_test_state *uts)
gd->default_log_level = LOGL_INFO; gd->default_log_level = LOGL_INFO;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<6>sandbox uboot: syslog_test_log_info() " env.expected = "<6>sandbox uboot: log_test_syslog_info() "
"testing log_info\n"; "testing log_info\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -212,15 +212,15 @@ static int syslog_test_log_info(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_info); LOG_TEST(log_test_syslog_info);
/** /**
* syslog_test_log_debug() - test log_debug() function * log_test_syslog_debug() - test log_debug() function
* *
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_debug(struct unit_test_state *uts) static int log_test_syslog_debug(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -229,7 +229,7 @@ static int syslog_test_log_debug(struct unit_test_state *uts)
gd->default_log_level = LOGL_DEBUG; gd->default_log_level = LOGL_DEBUG;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<7>sandbox uboot: syslog_test_log_debug() " env.expected = "<7>sandbox uboot: log_test_syslog_debug() "
"testing log_debug\n"; "testing log_debug\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -243,10 +243,10 @@ static int syslog_test_log_debug(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_debug); LOG_TEST(log_test_syslog_debug);
/** /**
* syslog_test_log_nodebug() - test logging level filter * log_test_syslog_nodebug() - test logging level filter
* *
* Verify that log_debug() does not lead to a log message if the logging level * Verify that log_debug() does not lead to a log message if the logging level
* is set to LOGL_INFO. * is set to LOGL_INFO.
@ -254,7 +254,7 @@ LOG_TEST(syslog_test_log_debug);
* @uts: unit test state * @uts: unit test state
* Return: 0 = success * Return: 0 = success
*/ */
static int syslog_test_log_nodebug(struct unit_test_state *uts) static int log_test_syslog_nodebug(struct unit_test_state *uts)
{ {
int old_log_level = gd->default_log_level; int old_log_level = gd->default_log_level;
struct sb_log_env env; struct sb_log_env env;
@ -263,7 +263,7 @@ static int syslog_test_log_nodebug(struct unit_test_state *uts)
gd->default_log_level = LOGL_INFO; gd->default_log_level = LOGL_INFO;
env_set("ethact", "eth@10002000"); env_set("ethact", "eth@10002000");
env_set("log_hostname", "sandbox"); env_set("log_hostname", "sandbox");
env.expected = "<7>sandbox uboot: syslog_test_log_nodebug() " env.expected = "<7>sandbox uboot: log_test_syslog_nodebug() "
"testing log_debug\n"; "testing log_debug\n";
env.uts = uts; env.uts = uts;
sandbox_eth_set_tx_handler(0, sb_log_tx_handler); sandbox_eth_set_tx_handler(0, sb_log_tx_handler);
@ -277,4 +277,4 @@ static int syslog_test_log_nodebug(struct unit_test_state *uts)
return 0; return 0;
} }
LOG_TEST(syslog_test_log_nodebug); LOG_TEST(log_test_syslog_nodebug);