[utest] add rt_memset test case

Author: mysterywolf

components/utilities/utest/utest.c

@@ -231,7 +231,7 @@ static void utest_do_run(const char *utest_name)
             {
                 if (tc_table[i].init() != RT_EOK)
                 {
-                    LOG_E("[  FAILED  ] [ result   ] testcase (%s)", tc_table[i].name);
+                    LOG_E("[  FAILED  ] [ result   ] testcase init (%s)", tc_table[i].name);
                     goto __tc_continue;
                 }
             }
@@ -259,7 +259,7 @@ static void utest_do_run(const char *utest_name)
             {
                 if (tc_table[i].cleanup() != RT_EOK)
                 {
-                    LOG_E("[  FAILED  ] [ result   ] testcase (%s)", tc_table[i].name);
+                    LOG_E("[  FAILED  ] [ result   ] testcase cleanup (%s)", tc_table[i].name);
                     goto __tc_continue;
                 }
             }

components/utilities/utest/utest_assert.h

@@ -50,6 +50,7 @@ void utest_assert_buf(const char *a, const char *b, rt_size_t sz, rt_bool_t equa
 */
 #define uassert_true(value)      __utest_assert(value, "(" #value ") is false")
 #define uassert_false(value)     __utest_assert(!(value), "(" #value ") is true")
+
 #define uassert_null(value)      __utest_assert((const char *)(value) == RT_NULL, "(" #value ") is not null")
 #define uassert_not_null(value)  __utest_assert((const char *)(value) != RT_NULL, "(" #value ") is null")
 

src/klibc/utest/TC_rt_memcpy.c

@@ -9,32 +9,26 @@
  * 2024-12-24     Meco Man           port to utest
  */
 
-#include <rtklibc.h>
+#include <rtthread.h>
 #include <utest.h>
 
+#define N 80 /**< Define the constant N for buffer size as 80 */
+#define TEST_BUF_SIZE 512 /**< Define the constant TEST_BUF_SIZE as 512 */
+static char *buf; /**< Define a static buffer of 512 bytes, initialized to 0 */
+
 static rt_err_t utest_tc_init(void)
 {
+    buf = rt_malloc(TEST_BUF_SIZE * sizeof(char)); /**< Allocate memory for the buffer */
+    uassert_not_null(buf);
     return RT_EOK;
 }
 
 static rt_err_t utest_tc_cleanup(void)
 {
+    rt_free(buf);
     return RT_EOK;
 }
 
-#define N 80 /**< Define the constant N for buffer size as 80 */
-static char buf[512] = {0}; /**< Define a static buffer of 512 bytes, initialized to 0 */
-
-/**
- * Align a given pointer to a 64-byte boundary.
- * @param p The pointer to align.
- * @return The aligned pointer.
- */
-static void* aligned(void* p)
-{
-    return (void*)(((intptr_t)p + 63) & -64);
-}
-
 /**
  * Test memory copy with alignment.
  * @param dalign The alignment offset for the destination buffer.
@@ -43,10 +37,10 @@ static void* aligned(void* p)
  */
 static void test_align(unsigned dalign, unsigned salign, size_t len)
 {
-    char* src = aligned(buf); /**< Source buffer starting address, 64-byte aligned */
-    char* dst = aligned(buf + 128); /**< Destination buffer starting address, 64-byte aligned from buf+128 */
-    char* want = aligned(buf + 256); /**< Expected result buffer starting address, 64-byte aligned from buf+256 */
-    char* p; /**< Pointer to receive the return value of rt_memcpy */
+    char *src = (char *)RT_ALIGN((rt_ubase_t)buf, 64); /**< Source buffer starting address, 64-byte aligned */
+    char *dst = (char *)RT_ALIGN(((rt_ubase_t)buf + 128), 64); /**< Destination buffer starting address, 64-byte aligned from buf+128 */
+    char *want = (char *)RT_ALIGN(((rt_ubase_t)buf + 256), 64); /**< Expected result buffer starting address, 64-byte aligned from buf+256 */
+    char *p; /**< Pointer to receive the return value of rt_memcpy */
     unsigned i;
 
     /** Assert that the source alignment offset plus length does not exceed N */

src/klibc/utest/TC_rt_memset.c

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2006-2024, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author             Notes
+ * 2020-05-06     Phillip Johnston   the first version
+ * 2024-12-24     Meco Man           port to utest
+ */
+
+#include <rtthread.h>
+#include <utest.h>
+
+#define TEST_BUF_SIZE 400
+
+static char *buf;
+static char *buf2;
+
+static rt_err_t utest_tc_init(void)
+{
+    buf = rt_malloc(TEST_BUF_SIZE * sizeof(char));
+	uassert_not_null(buf);
+    buf2 = rt_malloc(TEST_BUF_SIZE * sizeof(char));
+	uassert_not_null(buf2);
+    return RT_EOK;
+}
+
+static rt_err_t utest_tc_cleanup(void)
+{
+    rt_free(buf);
+    rt_free(buf2);
+    return RT_EOK;
+}
+
+static void test_align(int align, size_t len)
+{
+	char *s = (char *)RT_ALIGN(((rt_ubase_t)buf + 64), 64) + align;
+	char *want = (char *)RT_ALIGN(((rt_ubase_t)buf2 + 64), 64) + align;
+	char *p;
+	int i;
+
+	uassert_false(len + 64 > (size_t)(buf + TEST_BUF_SIZE - s));
+	uassert_false(len + 64 > (size_t)(buf2 + TEST_BUF_SIZE - want));
+
+	for(i = 0; i < TEST_BUF_SIZE; i++)
+	{
+		buf[i] = buf2[i] = ' ';
+	}
+
+	for(i = 0; i < (int)len; i++)
+	{
+		want[i] = '#';
+	}
+
+	p = rt_memset(s, '#', len);
+
+	uassert_ptr_equal(p, s);
+
+	for(i = -64; i < (int)len + 64; i++)
+	{
+		uassert_int_equal(s[i], want[i]);
+	}
+}
+
+static void TC_rt_memcpy_align(void)
+{
+	for(int i = 0; i < 16; i++)
+	{
+		for(size_t j = 0; j < 200; j++)
+		{
+			test_align(i, j);
+		}
+	}
+}
+
+static void test_input(char c)
+{
+	rt_memset(buf, c, 10);
+	for(int i = 0; i < 10; i++)
+	{
+		uassert_int_equal(buf[i], c);
+	}
+}
+
+static void TC_rt_memcpy_input(void)
+{
+	test_input('c');
+	test_input(0);
+	test_input(-1);
+    test_input(0xab);
+	test_input((char)RT_UINT32_MAX);
+	test_input((char)-RT_UINT32_MAX);
+}
+
+static void utest_do_tc(void)
+{
+    UTEST_UNIT_RUN(TC_rt_memcpy_align);
+    UTEST_UNIT_RUN(TC_rt_memcpy_input);
+}
+
+UTEST_TC_EXPORT(utest_do_tc, "klibc.rt_memset", utest_tc_init, utest_tc_cleanup, 1000);