The patch titled
Subject: lib-test-string_helpersc-add-string_get_size-tests-v5
has been added to the -mm tree. Its filename is
lib-test-string_helpersc-add-string_get_size-tests-v5.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/lib-test-string_helpersc-add-string_get_size-tests-v5.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/lib-test-string_helpersc-add-string_get_size-tests-v5.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Subject: lib-test-string_helpersc-add-string_get_size-tests-v5
- Single quotes in pr_warn() to see empty strings [Andy Shevchenko].
- Check for test validity compile-time [Rasmus Villemoes, Andy Shevchenko].
- All __test_string_get_size() arguments are const.
Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
Cc: James Bottomley <JBottomley@xxxxxxxx>
Cc: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Cc: Rasmus Villemoes <linux@xxxxxxxxxxxxxxxxxx>
Cc: "K. Y. Srinivasan" <kys@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/test-string_helpers.c | 23 ++++++++++++++++-------
1 file changed, 16 insertions(+), 7 deletions(-)
diff -puN lib/test-string_helpers.c~lib-test-string_helpersc-add-string_get_size-tests-v5 lib/test-string_helpers.c
--- a/lib/test-string_helpers.c~lib-test-string_helpersc-add-string_get_size-tests-v5
+++ a/lib/test-string_helpers.c
@@ -326,21 +326,30 @@ out:
kfree(out_test);
}
-static __init void test_string_get_size_one(u64 size, u64 blk_size,
- const enum string_size_units units,
- const char *exp_result)
+#define string_get_size_maxbuf 16
+#define test_string_get_size_one(size, blk_size, units, exp_result) \
+ do { \
+ BUILD_BUG_ON(sizeof(exp_result) >= string_get_size_maxbuf); \
+ __test_string_get_size((size), (blk_size), (units), \
+ (exp_result)); \
+ } while (0)
+
+
+static __init void __test_string_get_size(const u64 size, const u64 blk_size,
+ const enum string_size_units units,
+ const char *exp_result)
{
- char buf[256];
+ char buf[string_get_size_maxbuf];
string_get_size(size, blk_size, units, buf, sizeof(buf));
- if (!strncmp(buf, exp_result, min(sizeof(buf), strlen(exp_result))))
+ if (!memcmp(buf, exp_result, strlen(exp_result) + 1))
return;
+ buf[sizeof(buf) - 1] = '\0';
pr_warn("Test 'test_string_get_size_one' failed!\n");
pr_warn("string_get_size(size = %llu, blk_size = %llu, units = %d\n",
size, blk_size, units);
- pr_warn("expected: %s, got %s\n", exp_result, buf);
-
+ pr_warn("expected: '%s', got '%s'\n", exp_result, buf);
}
static __init void test_string_get_size(void)
_
Patches currently in -mm which might be from vkuznets@xxxxxxxxxx are
lib-string_helpersc-fix-infinite-loop-in-string_get_size.patch
lib-string_helpersc-fix-infinite-loop-in-string_get_size-v3.patch
lib-test-string_helpersc-add-string_get_size-tests.patch
lib-test-string_helpersc-add-string_get_size-tests-v5.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
