From d57675fc67455faf7c68d4003a1ce884779e2c7c Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 3 Apr 2023 10:17:38 +0200 Subject: Merging upstream version 2.4+really2.3. This reverts commit f42531334c05b7f49ae43c0a27e347a487fb2667. --- unit/meson.build | 18 ----- unit/test-argconfig-parse.c | 164 ---------------------------------------- unit/test-suffix-binary-parse.c | 68 ----------------- unit/test-suffix-si-parse.c | 53 +++++-------- 4 files changed, 20 insertions(+), 283 deletions(-) delete mode 100644 unit/test-argconfig-parse.c delete mode 100644 unit/test-suffix-binary-parse.c (limited to 'unit') diff --git a/unit/meson.build b/unit/meson.build index 7e0e878..d4ff925 100644 --- a/unit/meson.build +++ b/unit/meson.build @@ -18,15 +18,6 @@ test_suffix_si_parse = executable( test('suffix_si_parse', test_suffix_si_parse) -test_suffix_binary_parse = executable( - 'test-suffix-binary-parse', - ['test-suffix-binary-parse.c', '../util/suffix.c'], - include_directories: [incdir, '..'], - dependencies: [libnvme_dep], -) - -test('suffix_binary_parse', test_suffix_binary_parse) - test_uint128_si = executable( 'test-uint128-si', ['test-uint128-si.c', '../util/types.c', '../util/suffix.c'], @@ -35,12 +26,3 @@ test_uint128_si = executable( ) test('uint128-si', test_uint128_si) - -test_argconfig_parse = executable( - 'test-argconfig-parse', - ['test-argconfig-parse.c', '../util/argconfig.c', '../util/suffix.c'], - include_directories: [incdir, '..'], - dependencies: [libnvme_dep], -) - -test('argconfig_parse', test_argconfig_parse) diff --git a/unit/test-argconfig-parse.c b/unit/test-argconfig-parse.c deleted file mode 100644 index 23c8d4f..0000000 --- a/unit/test-argconfig-parse.c +++ /dev/null @@ -1,164 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include -#include -#include - -#include "../util/argconfig.h" -#include "nvme/types.h" - -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - -static int test_rc; - -union val { - bool flag; - __u64 suffix; - __u32 uint; - int int_val; - __u64 long_val; - double double_val; - __u8 byte; - __u16 shrt; - int incr; - char *string; - char *fmt; - char *file; - char *list; - char *str; -}; - -struct toval_test { - char *arg; - void *val; - union val exp; - int size; - int ret; -}; - -static void check_val(const char *arg, void *exp, void *val, int size) -{ - if ((size && !memcmp(exp, val, size)) || - (!size && !strcmp(*(char **)exp, *(char **)val))) - return; - - switch (size) { - case 0: - printf("ERROR: printing {%s}, got '%s', expected '%s'\n", - arg, *(char **)val, *(char **)exp); - break; - default: - printf("ERROR: printing {%s}, got '%llu', expected '%llu'\n", - arg, *(unsigned long long *)val, *(unsigned long long *)exp); - break; - } - - test_rc = 1; -} - -struct cfg { - bool flag; - __u64 suffix; - __u32 uint; - int int_val; - __u64 long_val; - double double_val; - __u8 byte; - __u16 shrt; - int incr; - char *string; - char *fmt; - char *file; - char *list; - char *str; -}; - -static struct cfg cfg; - -#define VAL_TEST(a, c, v, l, r) \ - { a, &cfg.c, { .c = v }, l ? sizeof(cfg.c) : 0, r } - -static struct toval_test toval_tests[] = { - VAL_TEST("--flag", flag, true, true, 0), - VAL_TEST("--flag=1", flag, false, true, -EINVAL), - VAL_TEST("--suffix=0", suffix, 0, true, 0), - VAL_TEST("--suffix=1", suffix, 1, true, 0), - VAL_TEST("--suffix=1234", suffix, 1234, true, 0), - VAL_TEST("--suffix=4096", suffix, 4096, true, 0), - VAL_TEST("--suffix=1Ki", suffix, 1024, true, 0), - VAL_TEST("--suffix=34Gi", suffix, 36507222016, true, 0), - VAL_TEST("--suffix=34.9Ki", suffix, 0, true, -EINVAL), - VAL_TEST("--suffix=32Gii", suffix, 0, true, -EINVAL), - VAL_TEST("--uint=1", uint, 1, true, 0), - VAL_TEST("--int=1", int_val, 1, true, 0), - VAL_TEST("--long=1", long_val, 1, true, 0), - VAL_TEST("--double=1", double_val, 1, true, 0), - VAL_TEST("--byte=1", byte, 1, true, 0), - VAL_TEST("--byte=256", byte, 0, true, -EINVAL), - VAL_TEST("--shrt=1", shrt, 1, true, 0), - VAL_TEST("--incr", incr, 1, true, 0), - VAL_TEST("--incr=1", incr, 0, true, -EINVAL), - VAL_TEST("--string=string", string, "string", false, 0), - VAL_TEST("--fmt=fmt", fmt, "fmt", false, 0), - VAL_TEST("--file=file", file, "file", false, 0), - VAL_TEST("--list=list", list, "list", false, 0), - VAL_TEST("--str=str", str, "str", false, 0), -}; - -void toval_test(struct toval_test *test) -{ - const char *desc = "Test argconfig parse"; - int ret; - char *argv[] = { "test-argconfig", test->arg }; - - OPT_ARGS(opts) = { - OPT_FLAG("flag",'f', &cfg.flag, "flag"), - OPT_SUFFIX("suffix", 's', &cfg.suffix, "suffix"), - OPT_UINT("uint", 'u', &cfg.uint, "uint"), - OPT_INT("int", 'i', &cfg.int_val, "int"), - OPT_LONG("long", 'l', &cfg.long_val, "long"), - OPT_DOUBLE("double", 'd', &cfg.double_val, "double"), - OPT_BYTE("byte", 'b', &cfg.byte, "byte"), - OPT_SHRT("shrt", 'S', &cfg.shrt, "shrt"), - OPT_INCR("incr", 'I', &cfg.incr, "incr"), - OPT_STRING("string", 't', "STRING", &cfg.string, "string"), - OPT_FMT("fmt", 'F', &cfg.fmt, "fmt"), - OPT_FILE("file", 'L', &cfg.file, "file"), - OPT_LIST("list", 'T', &cfg.list, "list"), - OPT_STR("str", 'r', &cfg.str, "str"), - OPT_END() - }; - - ret = argconfig_parse(2, argv, desc, opts); - if (ret != test->ret) { - printf("ERROR: converting {%s} failed\n", test->arg); - test_rc = 1; - return; - } - if (ret) - return; - - check_val(test->arg, &test->exp, test->val, test->size); -} - -int main(void) -{ - unsigned int i; - FILE *f; - - test_rc = 0; - setlocale(LC_NUMERIC, "C"); - f = freopen("/dev/null", "w", stderr); - if (!f) - printf("ERROR: reopening stderr failed: %s\n", strerror(errno)); - - for (i = 0; i < ARRAY_SIZE(toval_tests); i++) - toval_test(&toval_tests[i]); - - if (f) - fclose(f); - - return test_rc ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/unit/test-suffix-binary-parse.c b/unit/test-suffix-binary-parse.c deleted file mode 100644 index 5f6ac4a..0000000 --- a/unit/test-suffix-binary-parse.c +++ /dev/null @@ -1,68 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later - -#include -#include -#include -#include - -#include "../util/suffix.h" -#include "../util/types.h" - -#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0])) - -static int test_rc; - -static void check_num(const char *val, __u64 exp, __u64 num) -{ - if (exp == num) - return; - - printf("ERROR: printing {%s}, got '%llu', expected '%llu'\n", - val, (unsigned long long)num, (unsigned long long)exp); - - test_rc = 1; -} - -struct tonum_test { - const char *val; - const uint64_t exp; - int ret; -}; - -static struct tonum_test tonum_tests[] = { - { "1234", 1234, 0 }, - { "1Ki", 1024, 0}, - { "34Gi", 36507222016, 0 }, - { "34.9Ki", 0, -EINVAL}, - { "32Gii", 0, -EINVAL }, -}; - -void tonum_test(struct tonum_test *test) -{ - char *endptr; - uint64_t num; - int ret; - - ret = suffix_binary_parse(test->val, &endptr, &num); - if (ret != test->ret) { - printf("ERROR: converting {%s} failed\n", test->val); - test_rc = 1; - return; - } - if (ret) - return; - - check_num(test->val, test->exp, num); -} - -int main(void) -{ - unsigned int i; - - test_rc = 0; - - for (i = 0; i < ARRAY_SIZE(tonum_tests); i++) - tonum_test(&tonum_tests[i]); - - return test_rc ? EXIT_FAILURE : EXIT_SUCCESS; -} diff --git a/unit/test-suffix-si-parse.c b/unit/test-suffix-si-parse.c index bc92455..879518b 100644 --- a/unit/test-suffix-si-parse.c +++ b/unit/test-suffix-si-parse.c @@ -3,8 +3,6 @@ #include #include #include -#include -#include #include "../util/suffix.h" #include "../util/types.h" @@ -13,54 +11,44 @@ static int test_rc; -static void check_num(const char *val, __u64 exp, __u64 num) +static void check_num(const char *val, int lbas, __u64 exp, __u64 num) { if (exp == num) return; - printf("ERROR: printing {%s}, got '%llu', expected '%llu'\n", - val, (unsigned long long)num, (unsigned long long)exp); + printf("ERROR: printing {%s} (lbas %d), got '%llu', expected '%llu'\n", + val, lbas, (unsigned long long)num, (unsigned long long)exp); test_rc = 1; } struct tonum_test { const char *val; - const uint64_t exp; - int ret; + int lbas; + const __u64 exp; }; static struct tonum_test tonum_tests[] = { - { "11995709440", 11995709440, 0 }, - { "1199570940", 1199570940, 0}, - { "234.567M", 234567000, 0 }, - { "1.2k", 1200, 0 }, - { "6.14T", 6140000000000, 0 }, - { "123.4567k", 123456, 0 }, - { "12345.6789101112M", 12345678910, 0}, - { "6.14", 6, 0 }, - { "6.14#", 0, -EINVAL }, - { "2,33", 0, -EINVAL }, - { "3..3", 0, -EINVAL }, - { "123.12MM", 0, -EINVAL }, + { "11995709440", 512, 11995709440 }, + { "1199570940", 512, 1199570940 }, + { "6.14T", 512, 11992187500 }, + { "6.14T", 520, 11807692307 }, + { "6.14T", 4096, 1499023437 }, + { "6.14", 512, 0 }, + { "6.14#", 512, 0 }, }; void tonum_test(struct tonum_test *test) { - char *endptr; - uint64_t num; - int ret; - - ret = suffix_si_parse(test->val, &endptr, &num); - if (ret != test->ret) { - printf("ERROR: converting {%s} failed\n", test->val); - test_rc = 1; - return; - } - if (ret) - return; + __u64 num; + bool suffixed; + + num = suffix_si_parse(test->val, &suffixed); + + if (suffixed) + num /= test->lbas; - check_num(test->val, test->exp, num); + check_num(test->val, test->lbas, test->exp, num); } int main(void) @@ -68,7 +56,6 @@ int main(void) unsigned int i; test_rc = 0; - setlocale(LC_NUMERIC, "C"); for (i = 0; i < ARRAY_SIZE(tonum_tests); i++) tonum_test(&tonum_tests[i]); -- cgit v1.2.3