lkml.org 
[lkml]   [2015]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v1 5/7] test_hexdump: check all bytes in real buffer
Date
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


\
 
 \ /
  Last update: 2015-11-11 18:01    [W:0.398 / U:0.120 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site