Merge branch 'uaccess' (batched user access infrastructure)

[deliverable/linux.git] / lib / test_hexdump.c

diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c
index 16a759374730d575747be4988cd4dc31a5649c19..3f415d8101f3209f16ba66143ee1b31b56d4b0b1 100644 (file)
--- a/lib/test_hexdump.c
+++ b/lib/test_hexdump.c
@@ -44,6 +44,9 @@ static const char * const test_data_8_le[] __initconst = {
 
 #define FILL_CHAR      '#'
 
+static unsigned total_tests __initdata;
+static unsigned failed_tests __initdata;
+
 static void __init test_hexdump_prepare_test(size_t len, int rowsize,
                                             int groupsize, char *test,
                                             size_t testlen, bool ascii)
@@ -107,6 +110,8 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
        char test[TEST_HEXDUMP_BUF_SIZE];
        char real[TEST_HEXDUMP_BUF_SIZE];
 
+       total_tests++;
+
        memset(real, FILL_CHAR, sizeof(real));
        hex_dump_to_buffer(data_b, len, rowsize, groupsize, real, sizeof(real),
                           ascii);
@@ -119,6 +124,7 @@ static void __init test_hexdump(size_t len, int rowsize, int groupsize,
                pr_err("Len: %zu row: %d group: %d\n", len, rowsize, groupsize);
                pr_err("Result: '%s'\n", real);
                pr_err("Expect: '%s'\n", test);
+               failed_tests++;
        }
 }
 
@@ -133,7 +139,9 @@ static void __init test_hexdump_set(int rowsize, bool ascii)
        test_hexdump(len, rowsize, 1, ascii);
 }
 
-static void __init test_hexdump_overflow(size_t buflen, bool ascii)
+static void __init test_hexdump_overflow(size_t buflen, size_t len,
+                                        int rowsize, int groupsize,
+                                        bool ascii)
 {
        char test[TEST_HEXDUMP_BUF_SIZE];
        char buf[TEST_HEXDUMP_BUF_SIZE];
@@ -141,6 +149,8 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii)
        int ae, he, e, f, r;
        bool a;
 
+       total_tests++;
+
        memset(buf, FILL_CHAR, sizeof(buf));
 
        r = hex_dump_to_buffer(data_b, len, rs, gs, buf, buflen, ascii);
@@ -173,16 +183,28 @@ static void __init test_hexdump_overflow(size_t buflen, bool ascii)
                        len, buflen, strnlen(buf, sizeof(buf)));
                pr_err("Result: %d '%s'\n", r, buf);
                pr_err("Expect: %d '%s'\n", e, test);
+               failed_tests++;
        }
 }
 
+static void __init test_hexdump_overflow_set(size_t buflen, bool ascii)
+{
+       unsigned int i = 0;
+       int rs = (get_random_int() % 2 + 1) * 16;
+
+       do {
+               int gs = 1 << i;
+               size_t len = get_random_int() % rs + gs;
+
+               test_hexdump_overflow(buflen, rounddown(len, gs), rs, gs, ascii);
+       } while (i++ < 3);
+}
+
 static int __init test_hexdump_init(void)
 {
        unsigned int i;
        int rowsize;
 
-       pr_info("Running tests...\n");
-
        rowsize = (get_random_int() % 2 + 1) * 16;
        for (i = 0; i < 16; i++)
                test_hexdump_set(rowsize, false);
@@ -192,12 +214,25 @@ static int __init test_hexdump_init(void)
                test_hexdump_set(rowsize, true);
 
        for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
-               test_hexdump_overflow(i, false);
+               test_hexdump_overflow_set(i, false);
 
        for (i = 0; i <= TEST_HEXDUMP_BUF_SIZE; i++)
-               test_hexdump_overflow(i, true);
+               test_hexdump_overflow_set(i, true);
+
+       if (failed_tests == 0)
+               pr_info("all %u tests passed\n", total_tests);
+       else
+               pr_err("failed %u out of %u tests\n", failed_tests, total_tests);
 
-       return -EINVAL;
+       return failed_tests ? -EINVAL : 0;
 }
 module_init(test_hexdump_init);
+
+static void __exit test_hexdump_exit(void)
+{
+       /* do nothing */
+}
+module_exit(test_hexdump_exit);
+
+MODULE_AUTHOR("Andy Shevchenko <andriy.shevchenko@linux.intel.com>");
 MODULE_LICENSE("Dual BSD/GPL");