From 0b38eb67a12b83a9d0446e50caea5890584731f6 Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Thu, 20 Sep 2018 13:55:05 +0300 Subject: runner: Make generate_piglit_name non-static and move it to job_list.c Signed-off-by: Petri Latvala Reviewed-by: Arkadiusz Hiler Acked-by: Tomi Sarvela #irc --- runner/job_list.c | 37 +++++++++++++++++++++++++++++++++++++ runner/job_list.h | 3 +++ runner/resultgen.c | 36 ------------------------------------ 3 files changed, 40 insertions(+), 36 deletions(-) (limited to 'runner') diff --git a/runner/job_list.c b/runner/job_list.c index 5fe88e4f..88f59b05 100644 --- a/runner/job_list.c +++ b/runner/job_list.c @@ -1,3 +1,4 @@ +#include #include #include #include @@ -284,6 +285,42 @@ static bool job_list_from_test_list(struct job_list *job_list, return any; } +static char *lowercase(const char *str) +{ + char *ret = malloc(strlen(str) + 1); + char *q = ret; + + while (*str) { + if (isspace(*str)) + break; + + *q++ = tolower(*str++); + } + *q = '\0'; + + return ret; +} + +void generate_piglit_name(const char *binary, const char *subtest, + char *namebuf, size_t namebuf_size) +{ + char *lc_binary = lowercase(binary); + char *lc_subtest = NULL; + + if (!subtest) { + snprintf(namebuf, namebuf_size, "igt@%s", lc_binary); + free(lc_binary); + return; + } + + lc_subtest = lowercase(subtest); + + snprintf(namebuf, namebuf_size, "igt@%s@%s", lc_binary, lc_subtest); + + free(lc_binary); + free(lc_subtest); +} + void init_job_list(struct job_list *job_list) { memset(job_list, 0, sizeof(*job_list)); diff --git a/runner/job_list.h b/runner/job_list.h index c726ab09..f8bbbddc 100644 --- a/runner/job_list.h +++ b/runner/job_list.h @@ -27,6 +27,9 @@ struct job_list size_t size; }; +void generate_piglit_name(const char *binary, const char *subtest, + char *namebuf, size_t namebuf_size); + void init_job_list(struct job_list *job_list); void free_job_list(struct job_list *job_list); bool create_job_list(struct job_list *job_list, struct settings *settings); diff --git a/runner/resultgen.c b/runner/resultgen.c index d939583d..d34b52db 100644 --- a/runner/resultgen.c +++ b/runner/resultgen.c @@ -148,22 +148,6 @@ static size_t count_lines(const char *buf, const char *bufend) return ret; } -static char *lowercase(const char *str) -{ - char *ret = malloc(strlen(str) + 1); - char *q = ret; - - while (*str) { - if (isspace(*str)) - break; - - *q++ = tolower(*str++); - } - *q = '\0'; - - return ret; -} - static void append_line(char **buf, size_t *buflen, char *line) { size_t linelen = strlen(line); @@ -173,26 +157,6 @@ static void append_line(char **buf, size_t *buflen, char *line) *buflen += linelen; } -static void generate_piglit_name(const char *binary, const char *subtest, - char *namebuf, size_t namebuf_size) -{ - char *lc_binary = lowercase(binary); - char *lc_subtest = NULL; - - if (!subtest) { - snprintf(namebuf, namebuf_size, "igt@%s", lc_binary); - free(lc_binary); - return; - } - - lc_subtest = lowercase(subtest); - - snprintf(namebuf, namebuf_size, "igt@%s@%s", lc_binary, lc_subtest); - - free(lc_binary); - free(lc_subtest); -} - static const struct { const char *output_str; const char *result_str; -- cgit v1.2.3