OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

test-cutils: Use qemu_strtosz() more often 

Use qemu_strtosz() instead of qemu_strtosz_MiB() where it doesn't
really make a difference.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1487708048-2131-19-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2017-02-21 21:14:02 +01:00
parent 17f942560e
commit 753f8da0e0
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/test-cutils.c
View File

@ -1376,16 +1376,16 @@ static void test_qemu_strtosz_simple(void)
int64_t res;
str = "0";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 0);
g_assert(endptr == str + 1);
str = "12345M";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 12345 * M_BYTE);
g_assert(endptr == str + 6);
res = qemu_strtosz_MiB(str, NULL);
res = qemu_strtosz(str, NULL);
g_assert_cmpint(res, ==, 12345 * M_BYTE);
/* Note: precision is 53 bits since we're parsing with strtod() */
@ -1437,31 +1437,31 @@ static void test_qemu_strtosz_units(void)
g_assert_cmpint(res, ==, M_BYTE);
g_assert(endptr == none + 1);
res = qemu_strtosz_MiB(b, &endptr);
res = qemu_strtosz(b, &endptr);
g_assert_cmpint(res, ==, 1);
g_assert(endptr == b + 2);
res = qemu_strtosz_MiB(k, &endptr);
res = qemu_strtosz(k, &endptr);
g_assert_cmpint(res, ==, K_BYTE);
g_assert(endptr == k + 2);
res = qemu_strtosz_MiB(m, &endptr);
res = qemu_strtosz(m, &endptr);
g_assert_cmpint(res, ==, M_BYTE);
g_assert(endptr == m + 2);
res = qemu_strtosz_MiB(g, &endptr);
res = qemu_strtosz(g, &endptr);
g_assert_cmpint(res, ==, G_BYTE);
g_assert(endptr == g + 2);
res = qemu_strtosz_MiB(t, &endptr);
res = qemu_strtosz(t, &endptr);
g_assert_cmpint(res, ==, T_BYTE);
g_assert(endptr == t + 2);
res = qemu_strtosz_MiB(p, &endptr);
res = qemu_strtosz(p, &endptr);
g_assert_cmpint(res, ==, P_BYTE);
g_assert(endptr == p + 2);
res = qemu_strtosz_MiB(e, &endptr);
res = qemu_strtosz(e, &endptr);
g_assert_cmpint(res, ==, E_BYTE);
g_assert(endptr == e + 2);
}
@ -1472,7 +1472,7 @@ static void test_qemu_strtosz_float(void)
char *endptr = NULL;
int64_t res;
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 12.345 * M_BYTE);
g_assert(endptr == str + 7);
}
@ -1484,17 +1484,17 @@ static void test_qemu_strtosz_invalid(void)
int64_t res;
str = "";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
str = " \t ";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
str = "crap";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -EINVAL);
g_assert(endptr == str);
}
@ -1511,7 +1511,7 @@ static void test_qemu_strtosz_trailing(void)
g_assert(endptr == str + 3);
str = "1kiB";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, 1024);
g_assert(endptr == str + 2);
}
@ -1523,7 +1523,7 @@ static void test_qemu_strtosz_erange(void)
int64_t res;
str = "-1";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -ERANGE);
g_assert(endptr == str + 2);
@ -1543,7 +1543,7 @@ static void test_qemu_strtosz_erange(void)
g_assert(endptr == str + 19);
str = "10E";
res = qemu_strtosz_MiB(str, &endptr);
res = qemu_strtosz(str, &endptr);
g_assert_cmpint(res, ==, -ERANGE);
g_assert(endptr == str + 3);
}