libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #3074 from liruncong/utest 

[components/utilities/utest]修正无测试用例时,执行utest_run时跑飞问题. utest_init增加__…
This commit is contained in:
Bernard Xiong 2019-09-15 09:31:24 +08:00 committed by GitHub
parent 109576c86a 7953cdfae3
commit d7addb66e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/utilities/utest/utest.c
View File

@ -63,20 +63,20 @@ void utest_log_lv_set(rt_uint8_t lv)
int utest_init(void) int utest_init(void)
{ {
/* initialize the utest commands table.*/ /* initialize the utest commands table.*/
#if defined(__CC_ARM) /* ARM C Compiler */ #if defined(__CC_ARM) || defined(__CLANG_ARM) /* ARM C Compiler */
extern const int UtestTcTab$$Base; extern const int UtestTcTab$$Base;
extern const int UtestTcTab$$Limit; extern const int UtestTcTab$$Limit;
tc_table = (utest_tc_export_t)&UtestTcTab$$Base; tc_table = (utest_tc_export_t)&UtestTcTab$$Base;
tc_num = (utest_tc_export_t)&UtestTcTab$$Limit - tc_table; tc_num = (utest_tc_export_t)&UtestTcTab$$Limit - tc_table;
#elif defined (__ICCARM__) || defined(__ICCRX__) /* for IAR Compiler */ #elif defined (__ICCARM__) || defined(__ICCRX__) /* for IAR Compiler */
tc_table = (utest_tc_export_t)__section_begin("UtestTcTab"); tc_table = (utest_tc_export_t)__section_begin("UtestTcTab");
tc_num = (utest_tc_export_t)__section_end("UtestTcTab") - tc_table; tc_num = (utest_tc_export_t)__section_end("UtestTcTab") - tc_table;
#elif defined (__GNUC__) /* for GCC Compiler */ #elif defined (__GNUC__) /* for GCC Compiler */
extern const int __rt_utest_tc_tab_start; extern const int __rt_utest_tc_tab_start;
extern const int __rt_utest_tc_tab_end; extern const int __rt_utest_tc_tab_end;
tc_table = (utest_tc_export_t)&__rt_utest_tc_tab_start; tc_table = (utest_tc_export_t)&__rt_utest_tc_tab_start;
tc_num = (utest_tc_export_t) &__rt_utest_tc_tab_end - tc_table; tc_num = (utest_tc_export_t) &__rt_utest_tc_tab_end - tc_table;
#endif /* defined(__CC_ARM) */ #endif
LOG_I("utest is initialize success."); LOG_I("utest is initialize success.");
LOG_I("total utest testcase num: (%d)", tc_num); LOG_I("total utest testcase num: (%d)", tc_num);
@ -215,7 +215,7 @@ static void utest_run(const char *utest_name)
i++; i++;
} }
if (i == tc_num && is_find == RT_FALSE) if (i == tc_num && is_find == RT_FALSE && utest_name != RT_NULL)
{ {
LOG_I("[==========] [ utest ] Not find (%s)", utest_name); LOG_I("[==========] [ utest ] Not find (%s)", utest_name);
LOG_I("[==========] [ utest ] finished"); LOG_I("[==========] [ utest ] finished");