From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Rasmus Villemoes <linux@rasmusvillemoes.dk>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [PATCH v1 5/7] test_hexdump: check all bytes in real buffer
Date: Wed, 11 Nov 2015 18:35:16 +0200 [thread overview]
Message-ID: <1447259718-19647-6-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1447259718-19647-1-git-send-email-andriy.shevchenko@linux.intel.com>
After processing by hex_dump_to_buffer() check all the parts to be expected.
Part 1. The actual expected hex dump with or without ASCII part.
This is provided by plain strcmp() call including check for the
terminating NUL.
Part 2. Check if the buffer is dirty beyond needed.
We fill the buffer by ' ' (space) characters, so, we expect to have the
tail of buffer will be left untouched. Check all bytes in the tail of
the buffer.
Part 3. Return code should be as expected.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
lib/test_hexdump.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c
index a3e3b01..9b95b67 100644
--- a/lib/test_hexdump.c
+++ b/lib/test_hexdump.c
@@ -128,10 +128,9 @@ static void __init test_hexdump_set(int rowsize, bool ascii)
static void __init test_hexdump_overflow(size_t buflen, bool ascii)
{
+ char test[TEST_HEXDUMP_BUF_SIZE];
char buf[TEST_HEXDUMP_BUF_SIZE];
- const char *t = test_data_1_le[0];
size_t len = 1;
- size_t l = buflen;
int rs = 16, gs = 1;
int ae, he, e, r;
bool a;
@@ -147,26 +146,27 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii)
e = ae;
else
e = he;
- buf[e + 2] = '\0';
if (!buflen) {
- a = r == e && buf[0] == ' ';
- } else if (l < 3) {
- a = r == e && buf[0] == '\0';
- } else if (l < 4) {
- a = r == e && !strcmp(buf, t);
- } else if (ascii) {
- if (l < 51)
- a = r == e && buf[l - 1] == '\0' && buf[l - 2] == ' ';
- else
- a = r == e && buf[50] == '\0' && buf[49] == '.';
+ memset(test, ' ', sizeof(test));
+ test[sizeof(buf) - 1] = '\0';
+
+ a = r == e && !memchr_inv(buf, ' ', sizeof(buf));
} else {
- a = r == e && buf[e] == '\0';
+ int f = min_t(int, e + 1, buflen);
+
+ test_hexdump_prepare_test(len, rs, gs, test, sizeof(test), ascii);
+ test[f - 1] = '\0';
+
+ a = r == e && !memchr_inv(buf + f, ' ', sizeof(buf) - f) && !strcmp(buf, test);
}
+ buf[sizeof(buf) - 1] = '\0';
+
if (!a) {
- pr_err("Len: %zu rc: %u strlen: %zu\n", buflen, r, strlen(buf));
- pr_err("Result: '%s'\n", buf);
+ pr_err("Len: %zu buflen: %zu strlen: %zu\n", len, buflen, strlen(buf));
+ pr_err("Result: %d '%s'\n", r, buf);
+ pr_err("Expect: %d '%s'\n", e, test);
}
}
--
2.6.2
next prev parent reply other threads:[~2015-11-11 16:37 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-11 16:35 [PATCH v1 0/7] hexdump: update test suite Andy Shevchenko
2015-11-11 16:35 ` [PATCH v1 1/7] test_hexdump: rename to test_hexdump Andy Shevchenko
2015-11-19 10:05 ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 2/7] test_hexdump: introduce test_hexdump_prepare_test() helper Andy Shevchenko
2015-11-19 10:05 ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 3/7] test_hexdump: go through all possible lengths of buffer Andy Shevchenko
2015-11-19 10:07 ` Rasmus Villemoes
2015-11-20 16:58 ` Andy Shevchenko
2015-11-23 8:59 ` Rasmus Villemoes
2015-11-26 15:22 ` Andy Shevchenko
2015-11-11 16:35 ` [PATCH v1 4/7] test_hexdump: replace magic numbers by their meaning Andy Shevchenko
2015-11-19 10:08 ` Rasmus Villemoes
2015-11-20 16:56 ` Andy Shevchenko
2015-11-11 16:35 ` Andy Shevchenko [this message]
2015-11-19 10:11 ` [PATCH v1 5/7] test_hexdump: check all bytes in real buffer Rasmus Villemoes
2015-11-20 16:55 ` Andy Shevchenko
2015-11-23 9:28 ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 6/7] test_hexdump: test all possible group sizes for overflow Andy Shevchenko
2015-11-19 10:14 ` Rasmus Villemoes
2015-11-20 16:43 ` Andy Shevchenko
2015-11-23 9:36 ` Rasmus Villemoes
2015-11-11 16:35 ` [PATCH v1 7/7] test_hexdump: print statistics at the end Andy Shevchenko
2015-11-19 10:16 ` Rasmus Villemoes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447259718-19647-6-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@rasmusvillemoes.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.