git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tile: fix build
[dpdk.git]
/
app
/
test
/
test_cmdline_string.c
diff --git
a/app/test/test_cmdline_string.c
b/app/test/test_cmdline_string.c
index
3ec0ce1
..
c5bb9c0
100644
(file)
--- a/
app/test/test_cmdline_string.c
+++ b/
app/test/test_cmdline_string.c
@@
-35,6
+35,7
@@
#include <string.h>
#include <inttypes.h>
#include <string.h>
#include <inttypes.h>
+#include <rte_common.h>
#include <rte_string_fns.h>
#include <cmdline_parse.h>
#include <rte_string_fns.h>
#include <cmdline_parse.h>
@@
-65,9
+66,10
@@
struct string_elt_str string_elt_strs[] = {
{"one#two\nwith\nnewlines#three", "two\nwith\nnewlines", 1},
};
{"one#two\nwith\nnewlines#three", "two\nwith\nnewlines", 1},
};
-#if CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE
+#if (CMDLINE_TEST_BUFSIZE < STR_TOKEN_SIZE) \
+|| (CMDLINE_TEST_BUFSIZE < STR_MULTI_TOKEN_SIZE)
#undef CMDLINE_TEST_BUFSIZE
#undef CMDLINE_TEST_BUFSIZE
-#define CMDLINE_TEST_BUFSIZE
STR_TOKEN_SIZE
+#define CMDLINE_TEST_BUFSIZE
RTE_MAX(STR_TOKEN_SIZE, STR_MULTI_TOKEN_SIZE)
#endif
struct string_nb_str {
#endif
struct string_nb_str {
@@
-97,6
+99,11
@@
struct string_parse_str string_parse_strs[] = {
{"two with\rgarbage\tcharacters\n",
"one#two with\rgarbage\tcharacters\n#three",
"two with\rgarbage\tcharacters\n"},
{"two with\rgarbage\tcharacters\n",
"one#two with\rgarbage\tcharacters\n#three",
"two with\rgarbage\tcharacters\n"},
+ {"one two", "one", "one"}, /* fixed string */
+ {"one two", TOKEN_STRING_MULTI, "one two"}, /* multi string */
+ {"one two", NULL, "one"}, /* any string */
+ {"one two #three", TOKEN_STRING_MULTI, "one two "},
+ /* multi string with comment */
};
};
@@
-124,7
+131,6
@@
struct string_invalid_str string_invalid_strs[] = {
"toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
"toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
"toolong!!!" },
"toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
"toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!toolong!!!"
"toolong!!!" },
- {"invalid", ""},
{"", "invalid"}
};
{"", "invalid"}
};
@@
-178,7
+184,7
@@
test_parse_string_invalid_param(void)
printf("Error: function accepted null token!\n");
return -1;
}
printf("Error: function accepted null token!\n");
return -1;
}
- if (cmdline_parse_string(NULL, buf, NULL) != -1) {
+ if (cmdline_parse_string(NULL, buf, NULL
, 0
) != -1) {
printf("Error: function accepted null token!\n");
return -1;
}
printf("Error: function accepted null token!\n");
return -1;
}
@@
-189,7
+195,8
@@
test_parse_string_invalid_param(void)
return -1;
}
if (cmdline_parse_string(
return -1;
}
if (cmdline_parse_string(
- (cmdline_parse_token_hdr_t*)&token, NULL, (void*)&result) != -1) {
+ (cmdline_parse_token_hdr_t*)&token, NULL,
+ (void*)&result, sizeof(result)) != -1) {
printf("Error: function accepted null buffer!\n");
return -1;
}
printf("Error: function accepted null buffer!\n");
return -1;
}
@@
-200,7
+207,7
@@
test_parse_string_invalid_param(void)
}
/* test null result */
if (cmdline_parse_string(
}
/* test null result */
if (cmdline_parse_string(
- (cmdline_parse_token_hdr_t*)&token, buf, NULL) == -1) {
+ (cmdline_parse_token_hdr_t*)&token, buf, NULL
, 0
) == -1) {
printf("Error: function rejected null result!\n");
return -1;
}
printf("Error: function rejected null result!\n");
return -1;
}
@@
-233,7
+240,8
@@
test_parse_string_invalid_data(void)
token.string_data.str = string_invalid_strs[i].fixed_str;
if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
token.string_data.str = string_invalid_strs[i].fixed_str;
if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
- string_invalid_strs[i].str, (void*)buf) != -1) {
+ string_invalid_strs[i].str, (void*)buf,
+ sizeof(buf)) != -1) {
memset(help_str, 0, sizeof(help_str));
memset(&help_token, 0, sizeof(help_token));
memset(help_str, 0, sizeof(help_str));
memset(&help_token, 0, sizeof(help_token));
@@
-330,7
+338,8
@@
test_parse_string_valid(void)
token.string_data.str = string_parse_strs[i].fixed_str;
if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
token.string_data.str = string_parse_strs[i].fixed_str;
if (cmdline_parse_string((cmdline_parse_token_hdr_t*)&token,
- string_parse_strs[i].str, (void*)buf) < 0) {
+ string_parse_strs[i].str, (void*)buf,
+ sizeof(buf)) < 0) {
/* clean help data */
memset(&help_token, 0, sizeof(help_token));
/* clean help data */
memset(&help_token, 0, sizeof(help_token));
@@
-347,8
+356,7
@@
test_parse_string_valid(void)
string_parse_strs[i].str, help_str);
return -1;
}
string_parse_strs[i].str, help_str);
return -1;
}
- if (strncmp(buf, string_parse_strs[i].result,
- sizeof(string_parse_strs[i].result) - 1) != 0) {
+ if (strcmp(buf, string_parse_strs[i].result) != 0) {
printf("Error: result mismatch!\n");
return -1;
}
printf("Error: result mismatch!\n");
return -1;
}