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-hostname-util.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-hostname-util.c')
-rw-r--r-- | src/test/test-hostname-util.c | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/src/test/test-hostname-util.c b/src/test/test-hostname-util.c index 2ac6622624..77e9a1992f 100644 --- a/src/test/test-hostname-util.c +++ b/src/test/test-hostname-util.c @@ -9,9 +9,7 @@ #include "tests.h" #include "tmpfile-util.h" -static void test_hostname_is_valid(void) { - log_info("/* %s */", __func__); - +TEST(hostname_is_valid) { assert_se(hostname_is_valid("foobar", 0)); assert_se(hostname_is_valid("foobar.com", 0)); assert_se(!hostname_is_valid("foobar.com.", 0)); @@ -48,11 +46,9 @@ static void test_hostname_is_valid(void) { assert_se(!hostname_is_valid("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", VALID_HOSTNAME_TRAILING_DOT)); } -static void test_hostname_cleanup(void) { +TEST(hostname_cleanup) { char *s; - log_info("/* %s */", __func__); - s = strdupa_safe("foobar"); assert_se(streq(hostname_cleanup(s), "foobar")); s = strdupa_safe("foobar.com"); @@ -95,11 +91,9 @@ static void test_hostname_cleanup(void) { assert_se(streq(hostname_cleanup(s), "xxxx.xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")); } -static void test_hostname_malloc(void) { +TEST(hostname_malloc) { _cleanup_free_ char *h = NULL, *l = NULL; - log_info("/* %s */", __func__); - assert_se(h = gethostname_malloc()); log_info("hostname_malloc: \"%s\"", h); @@ -107,9 +101,7 @@ static void test_hostname_malloc(void) { log_info("hostname_short_malloc: \"%s\"", l); } -static void test_default_hostname(void) { - log_info("/* %s */", __func__); - +TEST(default_hostname) { if (!hostname_is_valid(FALLBACK_HOSTNAME, 0)) { log_error("Configured fallback hostname \"%s\" is not valid.", FALLBACK_HOSTNAME); exit(EXIT_FAILURE); @@ -121,13 +113,4 @@ static void test_default_hostname(void) { assert_se(hostname_is_valid(n, 0)); } -int main(int argc, char *argv[]) { - test_setup_logging(LOG_DEBUG); - - test_hostname_is_valid(); - test_hostname_cleanup(); - test_hostname_malloc(); - test_default_hostname(); - - return 0; -} +DEFINE_TEST_MAIN(LOG_DEBUG); |