* [PATCH v2 2/3] testsuite: add support for testing output against regex [not found] <20190103210746.20048-1-lucas.demarchi@intel.com> @ 2019-01-03 21:07 ` Lucas De Marchi 2019-01-03 21:07 ` [PATCH v2 3/3] testsuite: move --show-exports test to use regex Lucas De Marchi 2019-01-04 16:12 ` [PATCH v2 1/3] testsuite: split out function to compare outputs exactly Yauheni Kaliuta 2 siblings, 0 replies; 4+ messages in thread From: Lucas De Marchi @ 2019-01-03 21:07 UTC (permalink / raw) To: linux-modules; +Cc: Yauheni Kaliuta Allow to test outputs when they don't match exactly, but should follow some regex patterns. This can be used when the info we are printing is randomized or depends on kernel configuration. --- testsuite/testsuite.c | 115 +++++++++++++++++++++++++++++++++++++++++- testsuite/testsuite.h | 6 +++ 2 files changed, 119 insertions(+), 2 deletions(-) diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index 508bbd3..1f0caaf 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -20,6 +20,7 @@ #include <fcntl.h> #include <getopt.h> #include <limits.h> +#include <regex.h> #include <stdarg.h> #include <stdio.h> #include <stdlib.h> @@ -293,8 +294,109 @@ static int check_activity(int fd, bool activity, const char *path, #define BUFSZ 4096 struct buffer { char buf[BUFSZ]; + unsigned int head; }; + +static bool cmpbuf_regex_one(const char *pattern, const char *s) +{ + _cleanup_(regfree) regex_t re = { }; + + return !regcomp(&re, pattern, REG_EXTENDED|REG_NOSUB) && + !regexec(&re, s, 0, NULL, 0); +} + +/* + * read fd and fd_match, checking the first matches the regex of the second, + * line by line + */ +static bool cmpbuf_regex(const struct test *t, const char *prefix, + int fd, int fd_match, struct buffer *buf, + struct buffer *buf_match) +{ + char *p, *p_match; + int done = 0, done_match = 0, r; + + if (buf->head >= sizeof(buf->buf)) { + ERR("Read %zu bytes without a newline\n", sizeof(buf->buf)); + ERR("output: %.*s", (int)sizeof(buf->buf), buf->buf); + return false; + } + + r = read(fd, buf->buf + buf->head, sizeof(buf->buf) - buf->head); + if (r <= 0) + return true; + + buf->head += r; + + /* + * Process as many lines as read from fd and that fits in the buffer - + * it's assumed that if we get N lines from fd, we should be able to + * get the same amount from fd_match + */ + for (;;) { + p = memchr(buf->buf + done, '\n', buf->head - done); + if (!p) + break; + *p = '\0'; + + p_match = memchr(buf_match->buf + done_match, '\n', + buf_match->head - done_match); + if (!p_match) { + if (buf_match->head >= sizeof(buf_match->buf)) { + ERR("Read %zu bytes without a match\n", sizeof(buf_match->buf)); + ERR("output: %.*s", (int)sizeof(buf_match->buf), buf_match->buf); + return false; + } + + /* pump more data from file */ + r = read(fd_match, buf_match->buf + buf_match->head, + sizeof(buf_match->buf) - buf_match->head); + if (r <= 0) { + ERR("could not read match fd %d\n", fd_match); + return false; + } + buf_match->head += r; + p_match = memchr(buf_match->buf + done_match, '\n', + buf_match->head - done_match); + if (!p_match) { + ERR("could not find match line from fd %d\n", fd_match); + return false; + } + } + *p_match = '\0'; + + if (!cmpbuf_regex_one(buf_match->buf + done_match, buf->buf + done)) { + ERR("Output does not match pattern on %s:\n", prefix); + ERR("pattern: %s\n", buf_match->buf + done_match); + ERR("output : %s\n", buf->buf + done); + return false; + } + + done = p - buf->buf + 1; + done_match = p_match - buf_match->buf + 1; + } + + /* + * Prepare for the next call: anything we processed we remove from the + * buffer by memmoving the remaining bytes up to the beginning + */ + if (done) { + if (buf->head - done) + memmove(buf->buf, buf->buf + done, buf->head - done); + buf->head -= done; + } + + if (done_match) { + if (buf_match->head - done_match) + memmove(buf_match->buf, buf_match->buf + done_match, + buf_match->head - done_match); + buf_match->head -= done_match; + } + + return true; +} + /* read fd and fd_match, checking they match exactly */ static bool cmpbuf_exact(const struct test *t, const char *prefix, int fd, int fd_match, struct buffer *buf, @@ -428,6 +530,7 @@ static bool test_run_parent_check_outputs(const struct test *t, for (i = 0; i < fdcount; i++) { int fd = *(int *)ev[i].data.ptr; + bool ret; if (ev[i].events & EPOLLIN) { int fd_match; @@ -452,9 +555,17 @@ static bool test_run_parent_check_outputs(const struct test *t, buf_match = buf + 1; - if (!cmpbuf_exact(t, prefix, fd, fd_match, - buf, buf_match)) + if (t->output.regex) + ret = cmpbuf_regex(t, prefix, fd, fd_match, + buf, buf_match); + else + ret = cmpbuf_exact(t, prefix, fd, fd_match, + buf, buf_match); + + if (!ret) { + err = -1; goto out; + } } else if (ev[i].events & EPOLLHUP) { if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, fd, NULL) < 0) { ERR("could not remove fd %d from epoll: %m\n", fd); diff --git a/testsuite/testsuite.h b/testsuite/testsuite.h index 2b31483..7ed96bf 100644 --- a/testsuite/testsuite.h +++ b/testsuite/testsuite.h @@ -88,6 +88,12 @@ struct test { /* File with correct stderr */ const char *err; + /* + * whether to treat the correct files as regex to the real + * output + */ + bool regex; + /* * Vector with pair of files * key = correct file -- 2.20.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 3/3] testsuite: move --show-exports test to use regex [not found] <20190103210746.20048-1-lucas.demarchi@intel.com> 2019-01-03 21:07 ` [PATCH v2 2/3] testsuite: add support for testing output against regex Lucas De Marchi @ 2019-01-03 21:07 ` Lucas De Marchi 2019-01-04 16:12 ` [PATCH v2 1/3] testsuite: split out function to compare outputs exactly Yauheni Kaliuta 2 siblings, 0 replies; 4+ messages in thread From: Lucas De Marchi @ 2019-01-03 21:07 UTC (permalink / raw) To: linux-modules; +Cc: Yauheni Kaliuta This allows it to pass if the kernel is configured with CONFIG_MODVERSIONS. --- .../rootfs-pristine/test-modprobe/show-exports/correct.txt | 2 +- testsuite/test-modprobe.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/testsuite/rootfs-pristine/test-modprobe/show-exports/correct.txt b/testsuite/rootfs-pristine/test-modprobe/show-exports/correct.txt index bc2d045..0d659ef 100644 --- a/testsuite/rootfs-pristine/test-modprobe/show-exports/correct.txt +++ b/testsuite/rootfs-pristine/test-modprobe/show-exports/correct.txt @@ -1 +1 @@ -0x00000000 printA +0x[0-9a-fA-F]+ printA diff --git a/testsuite/test-modprobe.c b/testsuite/test-modprobe.c index 52a6621..1cace82 100644 --- a/testsuite/test-modprobe.c +++ b/testsuite/test-modprobe.c @@ -114,6 +114,7 @@ DEFINE_TEST(modprobe_show_exports, }, .output = { .out = TESTSUITE_ROOTFS "test-modprobe/show-exports/correct.txt", + .regex = true, }); -- 2.20.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/3] testsuite: split out function to compare outputs exactly [not found] <20190103210746.20048-1-lucas.demarchi@intel.com> 2019-01-03 21:07 ` [PATCH v2 2/3] testsuite: add support for testing output against regex Lucas De Marchi 2019-01-03 21:07 ` [PATCH v2 3/3] testsuite: move --show-exports test to use regex Lucas De Marchi @ 2019-01-04 16:12 ` Yauheni Kaliuta 2019-01-04 20:58 ` Lucas De Marchi 2 siblings, 1 reply; 4+ messages in thread From: Yauheni Kaliuta @ 2019-01-04 16:12 UTC (permalink / raw) To: Lucas De Marchi; +Cc: linux-modules Hi, Lucas! Just in case, ACK. >>>>> On Thu, 3 Jan 2019 13:07:44 -0800, Lucas De Marchi wrote: > Move functionality to compare the exact output to a separate function > and allocate one buffer per output/match pair. This will allow us to > extend this to allow other types of comparisons. Since now we are using > heap-allocated buffer, keep the buffer allocation to the caller, so we > don't have to allocate and free it on every invocation. It also avoids > the different comparison functions to have to deal with it. > --- > testsuite/testsuite.c | 124 ++++++++++++++++++++++++------------------ > 1 file changed, 70 insertions(+), 54 deletions(-) > diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c > index 8512b56..508bbd3 100644 > --- a/testsuite/testsuite.c > +++ b/testsuite/testsuite.c > @@ -290,13 +290,64 @@ static int check_activity(int fd, bool activity, const char *path, > return -1; > } > -static inline bool test_run_parent_check_outputs(const struct test *t, > - int fdout, int fderr, int fdmonitor, pid_t child) > +#define BUFSZ 4096 > +struct buffer { > + char buf[BUFSZ]; > +}; > + > +/* read fd and fd_match, checking they match exactly */ > +static bool cmpbuf_exact(const struct test *t, const char *prefix, > + int fd, int fd_match, struct buffer *buf, > + struct buffer *buf_match) > +{ > + int r, rmatch, done = 0; > + > + r = read(fd, buf->buf, sizeof(buf->buf) - 1); > + if (r <= 0) > + /* try again later */ > + return true; > + > + /* read as much data from fd_match as we read from fd */ > + for (;;) { > + rmatch = read(fd_match, buf_match->buf + done, r - done); > + if (rmatch == 0) > + break; > + > + if (rmatch < 0) { > + if (errno == EINTR) > + continue; > + ERR("could not read match fd %d\n", fd_match); > + return false; > + } > + > + done += rmatch; > + } > + > + buf->buf[r] = '\0'; > + buf_match->buf[r] = '\0'; > + > + if (t->print_outputs) > + printf("%s: %s\n", prefix, buf->buf); > + > + if (!streq(buf->buf, buf_match->buf)) { > + ERR("Outputs do not match on %s:\n", prefix); > + ERR("correct:\n%s\n", buf_match->buf); > + ERR("wrong:\n%s\n", buf->buf); > + return false; > + } > + > + return true; > +} > + > +static bool test_run_parent_check_outputs(const struct test *t, > + int fdout, int fderr, int fdmonitor, > + pid_t child) > { > struct epoll_event ep_outpipe, ep_errpipe, ep_monitor; > int err, fd_ep, fd_matchout = -1, fd_matcherr = -1; > bool fd_activityout = false, fd_activityerr = false; > unsigned long long end_usec, start_usec; > + _cleanup_free_ struct buffer *buf_out = NULL, *buf_err = NULL; > fd_ep = epoll_create1(EPOLL_CLOEXEC); > if (fd_ep < 0) { > @@ -320,6 +371,7 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > ERR("could not add fd to epoll: %m\n"); > goto out; > } > + buf_out = calloc(2, sizeof(*buf_out)); > } else > fdout = -1; > @@ -340,6 +392,7 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > ERR("could not add fd to epoll: %m\n"); > goto out; > } > + buf_err = calloc(2, sizeof(*buf_err)); > } else > fderr = -1; > @@ -374,76 +427,39 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > } > for (i = 0; i < fdcount; i++) { > - int *fd = ev[i].data.ptr; > + int fd = *(int *)ev[i].data.ptr; > if (ev[i].events & EPOLLIN) { > - ssize_t r, done = 0; > - char buf[4096]; > - char bufmatch[4096]; > int fd_match; > + struct buffer *buf, *buf_match; > + const char *prefix; > - /* > - * compare the output from child with the one > - * saved as correct > - */ > - > - r = read(*fd, buf, sizeof(buf) - 1); > - if (r <= 0) > - continue; > - > - if (*fd == fdout) { > + if (fd == fdout) { > fd_match = fd_matchout; > + buf = buf_out; > fd_activityout = true; > - } else if (*fd == fderr) { > + prefix = "STDOUT"; > + } else if (fd == fderr) { > fd_match = fd_matcherr; > + buf = buf_err; > fd_activityerr = true; > + prefix = "STDERR"; > } else { > ERR("Unexpected activity on monitor pipe\n"); > err = -EINVAL; > goto out; > } > - for (;;) { > - int rmatch = read(fd_match, > - bufmatch + done, r - done); > - if (rmatch == 0) > - break; > - > - if (rmatch < 0) { > - if (errno == EINTR) > - continue; > - err = -errno; > - ERR("could not read match fd %d\n", > - fd_match); > - goto out; > - } > - > - done += rmatch; > - } > + buf_match = buf + 1; > - buf[r] = '\0'; > - bufmatch[r] = '\0'; > - > - if (t->print_outputs) > - printf("%s: %s\n", > - fd_match == fd_matchout ? "STDOUT:" : "STDERR:", > - buf); > - > - if (!streq(buf, bufmatch)) { > - ERR("Outputs do not match on %s:\n", > - fd_match == fd_matchout ? "STDOUT" : "STDERR"); > - ERR("correct:\n%s\n", bufmatch); > - ERR("wrong:\n%s\n", buf); > - err = -1; > + if (!cmpbuf_exact(t, prefix, fd, fd_match, > + buf, buf_match)) > goto out; > - } > } else if (ev[i].events & EPOLLHUP) { > - if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, > - *fd, NULL) < 0) { > - ERR("could not remove fd %d from epoll: %m\n", > - *fd); > + if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, fd, NULL) < 0) { > + ERR("could not remove fd %d from epoll: %m\n", fd); > } > - *fd = -1; > + *(int *)ev[i].data.ptr = -1; > } > } > } > -- > 2.20.0 -- WBR, Yauheni Kaliuta ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/3] testsuite: split out function to compare outputs exactly 2019-01-04 16:12 ` [PATCH v2 1/3] testsuite: split out function to compare outputs exactly Yauheni Kaliuta @ 2019-01-04 20:58 ` Lucas De Marchi 0 siblings, 0 replies; 4+ messages in thread From: Lucas De Marchi @ 2019-01-04 20:58 UTC (permalink / raw) To: Yauheni Kaliuta; +Cc: Lucas De Marchi, linux-modules On Fri, Jan 4, 2019 at 8:28 AM Yauheni Kaliuta <yauheni.kaliuta@redhat.com> wrote: > > Hi, Lucas! > > Just in case, ACK. pushed, thanks. Lucas De Marchi > > >>>>> On Thu, 3 Jan 2019 13:07:44 -0800, Lucas De Marchi wrote: > > > Move functionality to compare the exact output to a separate function > > and allocate one buffer per output/match pair. This will allow us to > > extend this to allow other types of comparisons. Since now we are using > > heap-allocated buffer, keep the buffer allocation to the caller, so we > > don't have to allocate and free it on every invocation. It also avoids > > the different comparison functions to have to deal with it. > > --- > > testsuite/testsuite.c | 124 ++++++++++++++++++++++++------------------ > > 1 file changed, 70 insertions(+), 54 deletions(-) > > > diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c > > index 8512b56..508bbd3 100644 > > --- a/testsuite/testsuite.c > > +++ b/testsuite/testsuite.c > > @@ -290,13 +290,64 @@ static int check_activity(int fd, bool activity, const char *path, > > return -1; > > } > > > -static inline bool test_run_parent_check_outputs(const struct test *t, > > - int fdout, int fderr, int fdmonitor, pid_t child) > > +#define BUFSZ 4096 > > +struct buffer { > > + char buf[BUFSZ]; > > +}; > > + > > +/* read fd and fd_match, checking they match exactly */ > > +static bool cmpbuf_exact(const struct test *t, const char *prefix, > > + int fd, int fd_match, struct buffer *buf, > > + struct buffer *buf_match) > > +{ > > + int r, rmatch, done = 0; > > + > > + r = read(fd, buf->buf, sizeof(buf->buf) - 1); > > + if (r <= 0) > > + /* try again later */ > > + return true; > > + > > + /* read as much data from fd_match as we read from fd */ > > + for (;;) { > > + rmatch = read(fd_match, buf_match->buf + done, r - done); > > + if (rmatch == 0) > > + break; > > + > > + if (rmatch < 0) { > > + if (errno == EINTR) > > + continue; > > + ERR("could not read match fd %d\n", fd_match); > > + return false; > > + } > > + > > + done += rmatch; > > + } > > + > > + buf->buf[r] = '\0'; > > + buf_match->buf[r] = '\0'; > > + > > + if (t->print_outputs) > > + printf("%s: %s\n", prefix, buf->buf); > > + > > + if (!streq(buf->buf, buf_match->buf)) { > > + ERR("Outputs do not match on %s:\n", prefix); > > + ERR("correct:\n%s\n", buf_match->buf); > > + ERR("wrong:\n%s\n", buf->buf); > > + return false; > > + } > > + > > + return true; > > +} > > + > > +static bool test_run_parent_check_outputs(const struct test *t, > > + int fdout, int fderr, int fdmonitor, > > + pid_t child) > > { > > struct epoll_event ep_outpipe, ep_errpipe, ep_monitor; > > int err, fd_ep, fd_matchout = -1, fd_matcherr = -1; > > bool fd_activityout = false, fd_activityerr = false; > > unsigned long long end_usec, start_usec; > > + _cleanup_free_ struct buffer *buf_out = NULL, *buf_err = NULL; > > > fd_ep = epoll_create1(EPOLL_CLOEXEC); > > if (fd_ep < 0) { > > @@ -320,6 +371,7 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > > ERR("could not add fd to epoll: %m\n"); > > goto out; > > } > > + buf_out = calloc(2, sizeof(*buf_out)); > > } else > > fdout = -1; > > > @@ -340,6 +392,7 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > > ERR("could not add fd to epoll: %m\n"); > > goto out; > > } > > + buf_err = calloc(2, sizeof(*buf_err)); > > } else > > fderr = -1; > > > @@ -374,76 +427,39 @@ static inline bool test_run_parent_check_outputs(const struct test *t, > > } > > > for (i = 0; i < fdcount; i++) { > > - int *fd = ev[i].data.ptr; > > + int fd = *(int *)ev[i].data.ptr; > > > if (ev[i].events & EPOLLIN) { > > - ssize_t r, done = 0; > > - char buf[4096]; > > - char bufmatch[4096]; > > int fd_match; > > + struct buffer *buf, *buf_match; > > + const char *prefix; > > > - /* > > - * compare the output from child with the one > > - * saved as correct > > - */ > > - > > - r = read(*fd, buf, sizeof(buf) - 1); > > - if (r <= 0) > > - continue; > > - > > - if (*fd == fdout) { > > + if (fd == fdout) { > > fd_match = fd_matchout; > > + buf = buf_out; > > fd_activityout = true; > > - } else if (*fd == fderr) { > > + prefix = "STDOUT"; > > + } else if (fd == fderr) { > > fd_match = fd_matcherr; > > + buf = buf_err; > > fd_activityerr = true; > > + prefix = "STDERR"; > > } else { > > ERR("Unexpected activity on monitor pipe\n"); > > err = -EINVAL; > > goto out; > > } > > > - for (;;) { > > - int rmatch = read(fd_match, > > - bufmatch + done, r - done); > > - if (rmatch == 0) > > - break; > > - > > - if (rmatch < 0) { > > - if (errno == EINTR) > > - continue; > > - err = -errno; > > - ERR("could not read match fd %d\n", > > - fd_match); > > - goto out; > > - } > > - > > - done += rmatch; > > - } > > + buf_match = buf + 1; > > > - buf[r] = '\0'; > > - bufmatch[r] = '\0'; > > - > > - if (t->print_outputs) > > - printf("%s: %s\n", > > - fd_match == fd_matchout ? "STDOUT:" : "STDERR:", > > - buf); > > - > > - if (!streq(buf, bufmatch)) { > > - ERR("Outputs do not match on %s:\n", > > - fd_match == fd_matchout ? "STDOUT" : "STDERR"); > > - ERR("correct:\n%s\n", bufmatch); > > - ERR("wrong:\n%s\n", buf); > > - err = -1; > > + if (!cmpbuf_exact(t, prefix, fd, fd_match, > > + buf, buf_match)) > > goto out; > > - } > > } else if (ev[i].events & EPOLLHUP) { > > - if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, > > - *fd, NULL) < 0) { > > - ERR("could not remove fd %d from epoll: %m\n", > > - *fd); > > + if (epoll_ctl(fd_ep, EPOLL_CTL_DEL, fd, NULL) < 0) { > > + ERR("could not remove fd %d from epoll: %m\n", fd); > > } > > - *fd = -1; > > + *(int *)ev[i].data.ptr = -1; > > } > > } > > } > > -- > > 2.20.0 > > > -- > WBR, > Yauheni Kaliuta -- Lucas De Marchi ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-04 20:58 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20190103210746.20048-1-lucas.demarchi@intel.com>
2019-01-03 21:07 ` [PATCH v2 2/3] testsuite: add support for testing output against regex Lucas De Marchi
2019-01-03 21:07 ` [PATCH v2 3/3] testsuite: move --show-exports test to use regex Lucas De Marchi
2019-01-04 16:12 ` [PATCH v2 1/3] testsuite: split out function to compare outputs exactly Yauheni Kaliuta
2019-01-04 20:58 ` Lucas De Marchi
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).