Re: [PATCH 3/3] lib/test-string_helpers.c: add string_get_size() tests

[Andy Shevchenko]

On Mon, 2015-10-26 at 16:18 +0100, Vitaly Kuznetsov wrote:
> Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> writes:
> 
> > On Mon, 2015-10-26 at 14:55 +0100, Vitaly Kuznetsov wrote:
> > > Add a couple of simple tests for string_get_size().
> > > 
> > 
> > In linux-next this one (or similar?) is commit 29f3d140.
> > I don't think you need it in the series since it's in Andrew's
> > patch
> > set already.
> > 
> 
> Ah, sorry, missed that. In case it was already merged

It's not yet in upstream afaiuc.


>  I'll just add a
> couple of additional tests here.

Then perhaps send it as a separate patch first?

> 
> > > Signed-off-by: Vitaly Kuznetsov <vkuznets@xxxxxxxxxx>
> > > ---
> > > Âlib/test-string_helpers.c | 44
> > > ++++++++++++++++++++++++++++++++++++++++++++
> > > Â1 file changed, 44 insertions(+)
> > > 
> > > diff --git a/lib/test-string_helpers.c b/lib/test-
> > > string_helpers.c
> > > index 8e376ef..a158cb3 100644
> > > --- a/lib/test-string_helpers.c
> > > +++ b/lib/test-string_helpers.c
> > > @@ -326,6 +326,47 @@ out:
> > > Â	kfree(out_test);
> > > Â}
> > > Â
> > > +#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
> > > u32
> > > blk_size,
> > > +					ÂÂconst enum
> > > string_size_units units,
> > > +					ÂÂconst char
> > > *exp_result)
> > > +{
> > > +	char buf[string_get_size_maxbuf];
> > > +
> > > +	string_get_size(size, blk_size, units, buf,
> > > sizeof(buf));
> > > +	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 = %u,
> > > units =
> > > %d\n",
> > > +		size, blk_size, units);
> > > +	pr_warn("expected: '%s', got '%s'\n", exp_result, buf);
> > > +}
> > > +
> > > +static __init void test_string_get_size(void)
> > > +{
> > > +	test_string_get_size_one(16384, 512, STRING_UNITS_2,
> > > "8.00
> > > MiB");
> > > +	test_string_get_size_one(500118192, 512, STRING_UNITS_2,
> > > "238 GiB");
> > > +	test_string_get_size_one(8192, 4096, STRING_UNITS_10,
> > > "33.5
> > > MB");
> > > +	test_string_get_size_one(1100, 1, STRING_UNITS_10, "1.10
> > > kB");
> > > +	test_string_get_size_one(3000, 1900, STRING_UNITS_10,
> > > "5.70
> > > MB");
> > > +	test_string_get_size_one(151234561234657, 3456789,
> > > STRING_UNITS_10,
> > > +				Â"522 EB");
> > > +	test_string_get_size_one(1999, U32_MAX - 1,
> > > STRING_UNITS_10,
> > > +				Â"8.58 TB");
> > > +	test_string_get_size_one(1, 512, STRING_UNITS_10, "512
> > > B");
> > > +	test_string_get_size_one(0, 512, STRING_UNITS_10, "0
> > > B");
> > > +}
> > > +
> > > Âstatic int __init test_string_helpers_init(void)
> > > Â{
> > > Â	unsigned int i;
> > > @@ -344,6 +385,9 @@ static int __init
> > > test_string_helpers_init(void)
> > > Â	for (i = 0; i < (ESCAPE_ANY_NP | ESCAPE_HEX) + 1; i++)
> > > Â		test_string_escape("escape 1", escape1, i,
> > > TEST_STRING_2_DICT_1);
> > > Â
> > > +	/* Test string_get_size() */
> > > +	test_string_get_size();
> > > +
> > > Â	return -EINVAL;
> > > Â}
> > > Âmodule_init(test_string_helpers_init);
> 

-- 
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Intel Finland Oy

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/