diff options
author | Jan Janssen <medhefgo@web.de> | 2021-11-24 12:00:02 +0100 |
---|---|---|
committer | Jan Janssen <medhefgo@web.de> | 2021-11-25 15:03:06 +0100 |
commit | 4f7452a8eb7a946efea927fae017d4d661097833 (patch) | |
tree | 413778cc0fb08fbbed0890130b5ba66c90581e61 /src/test/test-conf-parser.c | |
parent | 4d5ad9d951299c905453ac8e3769dc82b0a09fb4 (diff) | |
download | systemd-4f7452a8eb7a946efea927fae017d4d661097833.tar.gz |
test: Use TEST macro
This converts to TEST macro where it is trivial.
Some additional notable changes:
- simplify HAVE_LIBIDN #ifdef in test-dns-domain.c
- use saved_argc/saved_argv in test-copy.c, test-path-util.c,
test-tmpfiles.c and test-unit-file.c
Diffstat (limited to 'src/test/test-conf-parser.c')
-rw-r--r-- | src/test/test-conf-parser.c | 55 |
1 files changed, 19 insertions, 36 deletions
diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c index 5ecc3b2d37..e61932ab16 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -7,6 +7,7 @@ #include "macro.h" #include "string-util.h" #include "strv.h" +#include "tests.h" #include "tmpfile-util.h" #include "util.h" @@ -87,7 +88,7 @@ static void test_config_parse_nsec_one(const char *rvalue, nsec_t expected) { assert_se(expected == v); } -static void test_config_parse_path(void) { +TEST(config_parse_path) { test_config_parse_path_one("/path", "/path"); test_config_parse_path_one("/path//////////", "/path"); test_config_parse_path_one("///path/foo///bar////bar//", "/path/foo/bar/bar"); @@ -98,21 +99,21 @@ static void test_config_parse_path(void) { test_config_parse_path_one("/path/\xc3\x7f", NULL); } -static void test_config_parse_log_level(void) { +TEST(config_parse_log_level) { test_config_parse_log_level_one("debug", LOG_DEBUG); test_config_parse_log_level_one("info", LOG_INFO); test_config_parse_log_level_one("garbage", 0); } -static void test_config_parse_log_facility(void) { +TEST(config_parse_log_facility) { test_config_parse_log_facility_one("mail", LOG_MAIL); test_config_parse_log_facility_one("user", LOG_USER); test_config_parse_log_facility_one("garbage", 0); } -static void test_config_parse_iec_size(void) { +TEST(config_parse_iec_size) { test_config_parse_iec_size_one("1024", 1024); test_config_parse_iec_size_one("2K", 2048); test_config_parse_iec_size_one("10M", 10 * 1024 * 1024); @@ -125,7 +126,7 @@ static void test_config_parse_iec_size(void) { test_config_parse_iec_size_one("garbage", 0); } -static void test_config_parse_si_uint64(void) { +TEST(config_parse_si_uint64) { test_config_parse_si_uint64_one("1024", 1024); test_config_parse_si_uint64_one("2K", 2000); test_config_parse_si_uint64_one("10M", 10 * 1000 * 1000); @@ -138,7 +139,7 @@ static void test_config_parse_si_uint64(void) { test_config_parse_si_uint64_one("garbage", 0); } -static void test_config_parse_int(void) { +TEST(config_parse_int) { test_config_parse_int_one("1024", 1024); test_config_parse_int_one("-1024", -1024); test_config_parse_int_one("0", 0); @@ -149,7 +150,7 @@ static void test_config_parse_int(void) { test_config_parse_int_one("garbage", -1); } -static void test_config_parse_unsigned(void) { +TEST(config_parse_unsigned) { test_config_parse_unsigned_one("10241024", 10241024); test_config_parse_unsigned_one("1024", 1024); test_config_parse_unsigned_one("0", 0); @@ -160,7 +161,7 @@ static void test_config_parse_unsigned(void) { test_config_parse_unsigned_one("1000garbage", 0); } -static void test_config_parse_strv(void) { +TEST(config_parse_strv) { test_config_parse_strv_one("", STRV_MAKE_EMPTY); test_config_parse_strv_one("foo", STRV_MAKE("foo")); test_config_parse_strv_one("foo bar foo", STRV_MAKE("foo", "bar", "foo")); @@ -169,7 +170,7 @@ static void test_config_parse_strv(void) { test_config_parse_strv_one("\xc3\x7f", STRV_MAKE("\xc3\x7f")); } -static void test_config_parse_mode(void) { +TEST(config_parse_mode) { test_config_parse_mode_one("777", 0777); test_config_parse_mode_one("644", 0644); @@ -180,7 +181,7 @@ static void test_config_parse_mode(void) { test_config_parse_mode_one("777 garbage", 0); } -static void test_config_parse_sec(void) { +TEST(config_parse_sec) { test_config_parse_sec_one("1", 1 * USEC_PER_SEC); test_config_parse_sec_one("1s", 1 * USEC_PER_SEC); test_config_parse_sec_one("100ms", 100 * USEC_PER_MSEC); @@ -191,7 +192,7 @@ static void test_config_parse_sec(void) { test_config_parse_sec_one("garbage", 0); } -static void test_config_parse_nsec(void) { +TEST(config_parse_nsec) { test_config_parse_nsec_one("1", 1); test_config_parse_nsec_one("1s", 1 * NSEC_PER_SEC); test_config_parse_nsec_one("100ms", 100 * NSEC_PER_MSEC); @@ -202,7 +203,7 @@ static void test_config_parse_nsec(void) { test_config_parse_nsec_one("garbage", 0); } -static void test_config_parse_iec_uint64(void) { +TEST(config_parse_iec_uint64) { 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); @@ -310,7 +311,7 @@ static const char* const config_file[] = { "setting1=3\n", }; -static void test_config_parse(unsigned i, const char *s) { +static void test_config_parse_one(unsigned i, const char *s) { _cleanup_(unlink_tempfilep) char name[] = "/tmp/test-conf-parser.XXXXXX"; _cleanup_fclose_ FILE *f = NULL; _cleanup_free_ char *setting1 = NULL; @@ -385,27 +386,9 @@ static void test_config_parse(unsigned i, const char *s) { } } -int main(int argc, char **argv) { - unsigned i; - - log_parse_environment(); - log_open(); - - test_config_parse_path(); - test_config_parse_log_level(); - test_config_parse_log_facility(); - test_config_parse_iec_size(); - test_config_parse_si_uint64(); - test_config_parse_int(); - test_config_parse_unsigned(); - test_config_parse_strv(); - test_config_parse_mode(); - test_config_parse_sec(); - test_config_parse_nsec(); - test_config_parse_iec_uint64(); - - for (i = 0; i < ELEMENTSOF(config_file); i++) - test_config_parse(i, config_file[i]); - - return 0; +TEST(config_parse) { + for (unsigned i = 0; i < ELEMENTSOF(config_file); i++) + test_config_parse_one(i, config_file[i]); } + +DEFINE_TEST_MAIN(LOG_INFO); |