leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

selftests/bpf: test_sockmap, print additional test options

Browse Source 
Print values of test options like apply, cork, start, end so that
individual failed tests can be identified for manual run

Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: Prashant Bhole <bhole_prashant_q7@lab.ntt.co.jp>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
This commit is contained in:
Prashant Bhole 2018-05-31 13:42:40 +09:00 committed by Daniel Borkmann
parent d825e12f08
commit 73563aa3d9
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tools/testing/selftests/bpf/test_sockmap.c
View File

@ -876,6 +876,8 @@ static char *test_to_str(int test)
#define OPTSTRING 60 #define OPTSTRING 60
static void test_options(char *options) static void test_options(char *options)
{ {
char tstr[OPTSTRING];
memset(options, 0, OPTSTRING); memset(options, 0, OPTSTRING);
if (txmsg_pass) if (txmsg_pass)
@ -888,14 +890,22 @@ static void test_options(char *options)
strncat(options, "redir_noisy,", OPTSTRING); strncat(options, "redir_noisy,", OPTSTRING);
if (txmsg_drop) if (txmsg_drop)
strncat(options, "drop,", OPTSTRING); strncat(options, "drop,", OPTSTRING);
if (txmsg_apply) if (txmsg_apply) {
strncat(options, "apply,", OPTSTRING); snprintf(tstr, OPTSTRING, "apply %d,", txmsg_apply);
if (txmsg_cork) strncat(options, tstr, OPTSTRING);
strncat(options, "cork,", OPTSTRING); }
if (txmsg_start) if (txmsg_cork) {
strncat(options, "start,", OPTSTRING); snprintf(tstr, OPTSTRING, "cork %d,", txmsg_cork);
if (txmsg_end) strncat(options, tstr, OPTSTRING);
strncat(options, "end,", OPTSTRING); }
if (txmsg_start) {
snprintf(tstr, OPTSTRING, "start %d,", txmsg_start);
strncat(options, tstr, OPTSTRING);
}
if (txmsg_end) {
snprintf(tstr, OPTSTRING, "end %d,", txmsg_end);
strncat(options, tstr, OPTSTRING);
}
if (txmsg_ingress) if (txmsg_ingress)
strncat(options, "ingress,", OPTSTRING); strncat(options, "ingress,", OPTSTRING);
if (txmsg_skb) if (txmsg_skb)
@ -904,7 +914,7 @@ static void test_options(char *options)
static int __test_exec(int cgrp, int test, struct sockmap_options *opt) static int __test_exec(int cgrp, int test, struct sockmap_options *opt)
{ {
char *options = calloc(60, sizeof(char)); char *options = calloc(OPTSTRING, sizeof(char));
int err; int err;
if (test == SENDPAGE) if (test == SENDPAGE)