fe6d2a0135
Sync the features and bug fixed in the etmem source repository. Signed-off-by: liubo <liubo254@huawei.com> (cherry picked from commit 07dd6a411bce9ed3d9f617a6f01ae076e24a3adf)
98 lines
4.2 KiB
Diff
98 lines
4.2 KiB
Diff
From d41d6ad31312da775f94a4d68b0d6c826b3476db Mon Sep 17 00:00:00 2001
|
|
From: liubo <liubo254@huawei.com>
|
|
Date: Thu, 26 May 2022 15:39:25 +0800
|
|
Subject: [PATCH 30/33] etmem: remove useless dt test code
|
|
|
|
The function get_keyword_and_value is removed,
|
|
the useless dt test code should also be removed
|
|
the same time.
|
|
|
|
Signed-off-by: liubo <liubo254@huawei.com>
|
|
---
|
|
.../etmem_common_func_llt.c | 62 ----------------------
|
|
1 file changed, 62 deletions(-)
|
|
|
|
diff --git a/etmem/test/etmem_common_func_llt_test/etmem_common_func_llt.c b/etmem/test/etmem_common_func_llt_test/etmem_common_func_llt.c
|
|
index 3700baa..93755ee 100644
|
|
--- a/etmem/test/etmem_common_func_llt_test/etmem_common_func_llt.c
|
|
+++ b/etmem/test/etmem_common_func_llt_test/etmem_common_func_llt.c
|
|
@@ -336,66 +336,6 @@ static void test_etmemd_send_ioctl_cmd_ok(void)
|
|
fclose(fp);
|
|
}
|
|
|
|
-static void test_get_key_value_error(void)
|
|
-{
|
|
- char key[KEY_VALUE_MAX_LEN] = {};
|
|
- char value[KEY_VALUE_MAX_LEN] = {};
|
|
-
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("abcd", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value(":1", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("a:", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("#a:1", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("a.b:1", key, value), -1);
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop:2*4", key, value), -1);
|
|
-}
|
|
-
|
|
-static void test_get_key_value_ok(void)
|
|
-{
|
|
- char key[KEY_VALUE_MAX_LEN] = {};
|
|
- char value[KEY_VALUE_MAX_LEN] = {};
|
|
-
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop:30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop 30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop\t30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop :30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop\t:30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("loop\t 30", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "loop");
|
|
- CU_ASSERT_STRING_EQUAL(value, "30");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("a_b:1", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "a_b");
|
|
- CU_ASSERT_STRING_EQUAL(value, "1");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("%P:1", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "%P");
|
|
- CU_ASSERT_STRING_EQUAL(value, "1");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("%P:0.2", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "%P");
|
|
- CU_ASSERT_STRING_EQUAL(value, "0.2");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("%P:20%", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "%P");
|
|
- CU_ASSERT_STRING_EQUAL(value, "20%");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("output:/var/run", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "output");
|
|
- CU_ASSERT_STRING_EQUAL(value, "/var/run");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("engine:dynamic_fb", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "engine");
|
|
- CU_ASSERT_STRING_EQUAL(value, "dynamic_fb");
|
|
- CU_ASSERT_EQUAL(get_keyword_and_value("name:qemu-kvm", key, value), 0);
|
|
- CU_ASSERT_STRING_EQUAL(key, "name");
|
|
- CU_ASSERT_STRING_EQUAL(value, "qemu-kvm");
|
|
-}
|
|
-
|
|
typedef enum {
|
|
CUNIT_SCREEN = 0,
|
|
CUNIT_XMLFILE,
|
|
@@ -434,8 +374,6 @@ int main(int argc, const char **argv)
|
|
CU_ADD_TEST(suite, test_get_uint_value_ok) == NULL ||
|
|
CU_ADD_TEST(suite, test_get_ulong_value_error) == NULL ||
|
|
CU_ADD_TEST(suite, test_get_ulong_value_ok) == NULL ||
|
|
- CU_ADD_TEST(suite, test_get_key_value_error) == NULL ||
|
|
- CU_ADD_TEST(suite, test_get_key_value_ok) == NULL ||
|
|
CU_ADD_TEST(suite, test_parse_cmdline_error) == NULL ||
|
|
CU_ADD_TEST(suite, test_parse_cmdline_ok) == NULL ||
|
|
CU_ADD_TEST(suite, test_get_proc_file_error) == NULL ||
|
|
--
|
|
1.8.3.1
|
|
|