From c2863417035ecf815ecd87df1722c4728f9eaaed Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Mon, 15 Feb 2021 17:20:50 +0100 Subject: [PATCH] Use SKIPPED_TEST_EXIT_CODE consistently Commit fa505bfb0e7623d7cfc94ae15a0246ae71000904 omitted two unit tests while introducing the SKIP_TEST_EXIT_CODE preprocessor macro. Fix the outliers to make use of SKIP_TEST_EXIT_CODE consistent across all unit tests. Also make sure lib/dns/tests/dnstap_test returns an exit code that indicates a skipped test when dnstap is not enabled. --- lib/dns/tests/dnstap_test.c | 3 ++- lib/isc/tests/doh_test.c | 2 +- lib/isc/tests/tlsdns_test.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index 5c46eda56d..13b4907d5d 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -382,7 +382,8 @@ main(void) { return (cmocka_run_group_tests(tests, NULL, NULL)); #else /* if HAVE_DNSTAP */ - print_message("1..0 # Skip dnstap not enabled\n"); + print_message("1..0 # Skipped: dnstap not enabled\n"); + return (SKIPPED_TEST_EXIT_CODE); #endif /* HAVE_DNSTAP */ } diff --git a/lib/isc/tests/doh_test.c b/lib/isc/tests/doh_test.c index 879e42a431..5159f0e5df 100644 --- a/lib/isc/tests/doh_test.c +++ b/lib/isc/tests/doh_test.c @@ -1765,7 +1765,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* if HAVE_CMOCKA */ diff --git a/lib/isc/tests/tlsdns_test.c b/lib/isc/tests/tlsdns_test.c index 9e1f6f5431..76b8974417 100644 --- a/lib/isc/tests/tlsdns_test.c +++ b/lib/isc/tests/tlsdns_test.c @@ -893,7 +893,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* if HAVE_CMOCKA */