X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftest%2Ftest-util.c;h=1d952ebf1dafd4dea215d07b6d582d2c18f54b76;hp=43bb0249a20e8833cca18d47ff24d9a1b8772d08;hb=03e334a1c7dc8c20c38902aa039440763acc9b17;hpb=2d5bdf5bc0e4714d42e5999a4e37553a6bf83575 diff --git a/src/test/test-util.c b/src/test/test-util.c index 43bb0249a..1d952ebf1 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -30,6 +30,7 @@ #include "strv.h" #include "def.h" #include "fileio.h" +#include "conf-parser.h" static void test_streq_ptr(void) { assert_se(streq_ptr(NULL, NULL)); @@ -66,7 +67,7 @@ static void test_close_many(void) { assert_se(fcntl(fds[1], F_GETFD) == -1); assert_se(fcntl(fds[2], F_GETFD) >= 0); - close_nointr_nofail(fds[2]); + safe_close(fds[2]); unlink(name0); unlink(name1); @@ -435,42 +436,80 @@ static void test_protect_errno(void) { assert(errno == 12); } -static void test_parse_bytes(void) { +static void test_parse_size(void) { off_t bytes; - assert_se(parse_bytes("111", &bytes) == 0); + assert_se(parse_size("111", 1024, &bytes) == 0); assert_se(bytes == 111); - assert_se(parse_bytes(" 112 B", &bytes) == 0); + assert_se(parse_size("111.4", 1024, &bytes) == 0); + assert_se(bytes == 111); + + assert_se(parse_size(" 112 B", 1024, &bytes) == 0); assert_se(bytes == 112); - assert_se(parse_bytes("3 K", &bytes) == 0); + assert_se(parse_size(" 112.6 B", 1024, &bytes) == 0); + assert_se(bytes == 112); + + assert_se(parse_size("3.5 K", 1024, &bytes) == 0); + assert_se(bytes == 3*1024 + 512); + + assert_se(parse_size("3. K", 1024, &bytes) == 0); assert_se(bytes == 3*1024); - assert_se(parse_bytes(" 4 M 11K", &bytes) == 0); - assert_se(bytes == 4*1024*1024 + 11 * 1024); + assert_se(parse_size("3.0 K", 1024, &bytes) == 0); + assert_se(bytes == 3*1024); + + assert_se(parse_size("3. 0 K", 1024, &bytes) == -EINVAL); + + assert_se(parse_size(" 4 M 11.5K", 1024, &bytes) == 0); + assert_se(bytes == 4*1024*1024 + 11 * 1024 + 512); + + assert_se(parse_size("3B3.5G", 1024, &bytes) == -EINVAL); - assert_se(parse_bytes("3B3G", &bytes) == 0); - assert_se(bytes == 3ULL*1024*1024*1024 + 3); + assert_se(parse_size("3.5G3B", 1024, &bytes) == 0); + assert_se(bytes == 3ULL*1024*1024*1024 + 512*1024*1024 + 3); - assert_se(parse_bytes("3B3G4T", &bytes) == 0); + assert_se(parse_size("3.5G 4B", 1024, &bytes) == 0); + assert_se(bytes == 3ULL*1024*1024*1024 + 512*1024*1024 + 4); + + assert_se(parse_size("3B3G4T", 1024, &bytes) == -EINVAL); + + assert_se(parse_size("4T3G3B", 1024, &bytes) == 0); assert_se(bytes == (4ULL*1024 + 3)*1024*1024*1024 + 3); - assert_se(parse_bytes("12P", &bytes) == 0); + assert_se(parse_size(" 4 T 3 G 3 B", 1024, &bytes) == 0); + assert_se(bytes == (4ULL*1024 + 3)*1024*1024*1024 + 3); + + assert_se(parse_size("12P", 1024, &bytes) == 0); assert_se(bytes == 12ULL * 1024*1024*1024*1024*1024); - assert_se(parse_bytes("3E 2P", &bytes) == 0); + assert_se(parse_size("12P12P", 1024, &bytes) == -EINVAL); + + assert_se(parse_size("3E 2P", 1024, &bytes) == 0); assert_se(bytes == (3 * 1024 + 2ULL) * 1024*1024*1024*1024*1024); - assert_se(parse_bytes("12X", &bytes) == -EINVAL); + assert_se(parse_size("12X", 1024, &bytes) == -EINVAL); - assert_se(parse_bytes("1024E", &bytes) == -ERANGE); - assert_se(parse_bytes("-1", &bytes) == -ERANGE); - assert_se(parse_bytes("-1024E", &bytes) == -ERANGE); + assert_se(parse_size("12.5X", 1024, &bytes) == -EINVAL); - assert_se(parse_bytes("-1024P", &bytes) == -ERANGE); + assert_se(parse_size("12.5e3", 1024, &bytes) == -EINVAL); - assert_se(parse_bytes("-10B 20K", &bytes) == -ERANGE); + assert_se(parse_size("1024E", 1024, &bytes) == -ERANGE); + assert_se(parse_size("-1", 1024, &bytes) == -ERANGE); + assert_se(parse_size("-1024E", 1024, &bytes) == -ERANGE); + + assert_se(parse_size("-1024P", 1024, &bytes) == -ERANGE); + + assert_se(parse_size("-10B 20K", 1024, &bytes) == -ERANGE); +} + +static void test_config_parse_iec_off(void) { + off_t offset = 0; + assert_se(config_parse_iec_off(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0); + assert_se(offset == 4 * 1024 * 1024); + + assert_se(config_parse_iec_off(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0); } static void test_strextend(void) { @@ -490,21 +529,6 @@ static void test_strrep(void) { assert_se(streq(zero, "")); } -static void test_parse_user_at_host(void) { - _cleanup_free_ char *both = strdup("waldo@waldoscomputer"); - _cleanup_free_ char *onlyhost = strdup("mikescomputer"); - char *user = NULL, *host = NULL; - - parse_user_at_host(both, &user, &host); - assert_se(streq(user, "waldo")); - assert_se(streq(host, "waldoscomputer")); - - user = host = NULL; - parse_user_at_host(onlyhost, &user, &host); - assert_se(user == NULL); - assert_se(streq(host, "mikescomputer")); -} - static void test_split_pair(void) { _cleanup_free_ char *a = NULL, *b = NULL; @@ -550,7 +574,6 @@ static void test_fstab_node_to_udev_node(void) { assert_se(streq(n, "/dev/disk/by-partuuid/037b9d94-148e-4ee4-8d38-67bfe15bb535")); free(n); - n = fstab_node_to_udev_node("PONIES=awesome"); puts(n); assert_se(streq(n, "PONIES=awesome")); @@ -580,22 +603,22 @@ static void test_in_set(void) { assert_se(!IN_SET(0, 1, 2, 3, 4)); } -static void test_writev_safe(void) { - char name[] = "/tmp/test-writev_safe.XXXXXX"; - _cleanup_free_ char *contents; +static void test_writing_tmpfile(void) { + char name[] = "/tmp/test-systemd_writing_tmpfile.XXXXXX"; + _cleanup_free_ char *contents = NULL; size_t size; int fd, r; - struct iovec iov[3]; + IOVEC_SET_STRING(iov[0], "abc\n"); IOVEC_SET_STRING(iov[1], ALPHANUMERICAL "\n"); IOVEC_SET_STRING(iov[2], ""); fd = mkostemp_safe(name, O_RDWR|O_CLOEXEC); - printf("test_writev_safe: %s", name); + printf("tmpfile: %s", name); - r = writev_safe(fd, iov, 3); - assert(r == 0); + r = writev(fd, iov, 3); + assert(r >= 0); r = read_full_file(name, &contents, &size); assert(r == 0); @@ -603,7 +626,40 @@ static void test_writev_safe(void) { assert(streq(contents, "abc\n" ALPHANUMERICAL "\n")); } +static void test_hexdump(void) { + uint8_t data[146]; + unsigned i; + + hexdump(stdout, NULL, 0); + hexdump(stdout, "", 0); + hexdump(stdout, "", 1); + hexdump(stdout, "x", 1); + hexdump(stdout, "x", 2); + hexdump(stdout, "foobar", 7); + hexdump(stdout, "f\nobar", 7); + hexdump(stdout, "xxxxxxxxxxxxxxxxxxxxyz", 23); + + for (i = 0; i < ELEMENTSOF(data); i++) + data[i] = i*2; + + hexdump(stdout, data, sizeof(data)); +} + +static void test_log2i(void) { + assert_se(log2i(1) == 0); + assert_se(log2i(2) == 1); + assert_se(log2i(3) == 1); + assert_se(log2i(4) == 2); + assert_se(log2i(32) == 5); + assert_se(log2i(33) == 5); + assert_se(log2i(63) == 5); + assert_se(log2i(INT_MAX) == sizeof(int)*8-2); +} + int main(int argc, char *argv[]) { + log_parse_environment(); + log_open(); + test_streq_ptr(); test_first_word(); test_close_many(); @@ -632,15 +688,17 @@ int main(int argc, char *argv[]) { test_u64log2(); test_get_process_comm(); test_protect_errno(); - test_parse_bytes(); + test_parse_size(); + test_config_parse_iec_off(); test_strextend(); test_strrep(); - test_parse_user_at_host(); test_split_pair(); test_fstab_node_to_udev_node(); test_get_files_in_directory(); test_in_set(); - test_writev_safe(); + test_writing_tmpfile(); + test_hexdump(); + test_log2i(); return 0; }