diff --git a/components/net/utest/tc_netdev.c b/components/net/utest/tc_netdev.c index e416e75f5fd..8e71c8f4d13 100644 --- a/components/net/utest/tc_netdev.c +++ b/components/net/utest/tc_netdev.c @@ -90,9 +90,14 @@ rt_err_t multiple_ping_test(struct netdev *netdev, const char *host, rt_uint32_t static void test_netdev_ping(void) { #define UTEST_INTRANET_WRONG_IP_ADDR "192.256.0.321" /* Invalid IP format */ -#define UTEST_EXTERNAL_IP_ADDR "8.8.8.8" /* Valid external IP */ -#define UTEST_EXTERNAL_WRONG_IP_ADDR "123.456.789.012" /* Invalid IP format */ +#ifdef RT_USING_CI_ACTION +#define UTEST_EXTERNAL_IP_ADDR "1.1.1.1" /* Valid external IP */ +#define UTEST_EXTERNAL_URL "one.one.one.one" /* Valid external URL */ +#else +#define UTEST_EXTERNAL_IP_ADDR "114.114.114.114" /* Valid external IP */ #define UTEST_EXTERNAL_URL "www.baidu.com" /* Valid external URL */ +#endif +#define UTEST_EXTERNAL_WRONG_IP_ADDR "123.456.789.012" /* Invalid IP format */ #define UTEST_EXTERNAL_WRONG_URL "www.abcsdd.com" /* Non-existent URL */ rt_err_t res = RT_EOK; @@ -105,14 +110,14 @@ static void test_netdev_ping(void) res = multiple_ping_test(netdev_default, UTEST_INTRANET_WRONG_IP_ADDR, 1); uassert_false(res == RT_EOK); - /* Test ping to external IP address - should succeed */ - res = multiple_ping_test(netdev_default, UTEST_EXTERNAL_IP_ADDR, 10); - uassert_true(res == RT_EOK); - /* Test ping to invalid external IP - should fail */ res = multiple_ping_test(netdev_default, UTEST_EXTERNAL_WRONG_IP_ADDR, 1); uassert_false(res == RT_EOK); + /* Test ping to external IP address - should succeed */ + res = multiple_ping_test(netdev_default, UTEST_EXTERNAL_IP_ADDR, 10); + uassert_true(res == RT_EOK); + /* Test ping to external URL - should succeed */ res = multiple_ping_test(netdev_default, UTEST_EXTERNAL_URL, 10); uassert_true(res == RT_EOK); diff --git a/components/utilities/utest/utest.c b/components/utilities/utest/utest.c index f215b01ecc8..9185445e24c 100644 --- a/components/utilities/utest/utest.c +++ b/components/utilities/utest/utest.c @@ -22,7 +22,7 @@ #endif #include -#if RT_CONSOLEBUF_SIZE < 256 +#if defined(RT_CONSOLEBUF_SIZE) && RT_CONSOLEBUF_SIZE < 256 #error "RT_CONSOLEBUF_SIZE is less than 256!" #endif @@ -279,6 +279,10 @@ static void utest_do_run(const char *utest_name) if (tc_table[i].tc != RT_NULL) { + local_utest.error = UTEST_PASSED; + local_utest.passed_num = 0; + local_utest.failed_num = 0; + tc_table[i].tc(); if (local_utest.failed_num == 0) { @@ -433,6 +437,9 @@ utest_t utest_handle_get(void) void utest_unit_run(test_unit_func func, const char *unit_func_name) { + rt_uint32_t passed_num = local_utest.passed_num; + rt_uint32_t failed_num = local_utest.failed_num; + LOG_I("[==========] utest unit name: (%s)", unit_func_name); local_utest.error = UTEST_PASSED; local_utest.passed_num = 0; @@ -442,6 +449,16 @@ void utest_unit_run(test_unit_func func, const char *unit_func_name) { func(); } + + passed_num += local_utest.passed_num; + failed_num += local_utest.failed_num; + + local_utest.passed_num = passed_num; + local_utest.failed_num = failed_num; + if (local_utest.failed_num != 0) + { + local_utest.error = UTEST_FAILED; + } } /*