From f55211dbce00fad7cd16fa40d7f7b76448049a86 Mon Sep 17 00:00:00 2001 From: Ronny Chevalier Date: Thu, 3 Mar 2016 00:08:10 +0100 Subject: tests: move conf-parser related tests to test-conf-parser.c --- src/test/test-conf-parser.c | 9 +++++++++ src/test/test-util.c | 10 ---------- 2 files changed, 9 insertions(+), 10 deletions(-) (limited to 'src/test') diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index b3a4c40339..be5d2611f8 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -215,6 +215,14 @@ static void test_config_parse_nsec(void) { test_config_parse_nsec_one("garbage", 0); } +static void test_config_parse_iec_uint64(void) { + uint64_t offset = 0; + assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0); + assert_se(offset == 4 * 1024 * 1024); + + assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0); +} + int main(int argc, char **argv) { log_parse_environment(); log_open(); @@ -230,6 +238,7 @@ int main(int argc, char **argv) { test_config_parse_mode(); test_config_parse_sec(); test_config_parse_nsec(); + test_config_parse_iec_uint64(); return 0; } diff --git a/src/test/test-util.c b/src/test/test-util.c index 30444e122a..7226e9b76f 100644 --- a/src/test/test-util.c +++ b/src/test/test-util.c @@ -27,7 +27,6 @@ #include #include "alloc-util.h" -#include "conf-parser.h" #include "def.h" #include "fd-util.h" #include "fileio.h" @@ -190,14 +189,6 @@ static void test_protect_errno(void) { assert_se(errno == 12); } -static void test_config_parse_iec_uint64(void) { - uint64_t offset = 0; - assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4M", &offset, NULL) == 0); - assert_se(offset == 4 * 1024 * 1024); - - assert_se(config_parse_iec_uint64(NULL, "/this/file", 11, "Section", 22, "Size", 0, "4.5M", &offset, NULL) == 0); -} - static void test_fstab_node_to_udev_node(void) { char *n; @@ -487,7 +478,6 @@ int main(int argc, char *argv[]) { test_div_round_up(); test_u64log2(); test_protect_errno(); - test_config_parse_iec_uint64(); test_fstab_node_to_udev_node(); test_get_files_in_directory(); test_in_set(); -- cgit v1.2.3-54-g00ecf