From: Michal Nowak Date: Mon, 18 Jan 2021 18:15:44 +0000 (+0100) Subject: Record skipped unit test as skipped in Automake framework X-Git-Tag: v9.17.11~54^2~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa505bfb0e7623d7cfc94ae15a0246ae71000904;p=thirdparty%2Fbind9.git Record skipped unit test as skipped in Automake framework --- diff --git a/Makefile.tests b/Makefile.tests index 2d39eb8f258..3b5e07d90c6 100644 --- a/Makefile.tests +++ b/Makefile.tests @@ -3,8 +3,9 @@ AM_CPPFLAGS += \ $(CMOCKA_CFLAGS) \ - -DTESTS_DIR=\"$(abs_srcdir)\" \ - -DNAMED_PLUGINDIR=\"$(libdir)/named\" + -DNAMED_PLUGINDIR=\"$(libdir)/named\" \ + -DSKIPPED_TEST_EXIT_CODE=77 \ + -DTESTS_DIR=\"$(abs_srcdir)\" LDADD = \ $(CMOCKA_LIBS) diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c index 93758ad252d..f04b8a8e87d 100644 --- a/lib/dns/tests/acl_test.c +++ b/lib/dns/tests/acl_test.c @@ -150,7 +150,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/dns/tests/db_test.c b/lib/dns/tests/db_test.c index 0d348999bf7..c12e90ee1c1 100644 --- a/lib/dns/tests/db_test.c +++ b/lib/dns/tests/db_test.c @@ -417,7 +417,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/dns/tests/dbdiff_test.c b/lib/dns/tests/dbdiff_test.c index 3246d608141..a62496f6ebd 100644 --- a/lib/dns/tests/dbdiff_test.c +++ b/lib/dns/tests/dbdiff_test.c @@ -177,7 +177,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/dns/tests/dbiterator_test.c b/lib/dns/tests/dbiterator_test.c index e6ae81ea364..13a4976d458 100644 --- a/lib/dns/tests/dbiterator_test.c +++ b/lib/dns/tests/dbiterator_test.c @@ -386,7 +386,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/dns/tests/dbversion_test.c b/lib/dns/tests/dbversion_test.c index 0891bf19cd9..d90316504f5 100644 --- a/lib/dns/tests/dbversion_test.c +++ b/lib/dns/tests/dbversion_test.c @@ -491,7 +491,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/dns/tests/dh_test.c b/lib/dns/tests/dh_test.c index 176f9387638..db7cac9b6ae 100644 --- a/lib/dns/tests/dh_test.c +++ b/lib/dns/tests/dh_test.c @@ -100,6 +100,7 @@ main(void) { return (cmocka_run_group_tests(tests, NULL, NULL)); #else /* if USE_OPENSSL */ print_message("1..0 # Skipped: dh test broken with PKCS11"); + return (SKIPPED_TEST_EXIT_CODE); #endif /* if USE_OPENSSL */ } @@ -110,7 +111,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/dns/tests/dispatch_test.c b/lib/dns/tests/dispatch_test.c index b8cc954c88b..7bd0712d56a 100644 --- a/lib/dns/tests/dispatch_test.c +++ b/lib/dns/tests/dispatch_test.c @@ -352,7 +352,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/dns/tests/dns64_test.c b/lib/dns/tests/dns64_test.c index 450b09ac67d..c95504cfa86 100644 --- a/lib/dns/tests/dns64_test.c +++ b/lib/dns/tests/dns64_test.c @@ -244,7 +244,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif diff --git a/lib/dns/tests/dnstap_test.c b/lib/dns/tests/dnstap_test.c index 0a64de7544d..b41cd14fd45 100644 --- a/lib/dns/tests/dnstap_test.c +++ b/lib/dns/tests/dnstap_test.c @@ -391,7 +391,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */ diff --git a/lib/dns/tests/dst_test.c b/lib/dns/tests/dst_test.c index 4cffaae0a84..288ac5b7b71 100644 --- a/lib/dns/tests/dst_test.c +++ b/lib/dns/tests/dst_test.c @@ -302,7 +302,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/dns/tests/geoip_test.c b/lib/dns/tests/geoip_test.c index 2f96692d516..b7020ccc1d1 100644 --- a/lib/dns/tests/geoip_test.c +++ b/lib/dns/tests/geoip_test.c @@ -418,7 +418,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */ diff --git a/lib/dns/tests/keytable_test.c b/lib/dns/tests/keytable_test.c index e6a96350bdc..9d482d7bb6f 100644 --- a/lib/dns/tests/keytable_test.c +++ b/lib/dns/tests/keytable_test.c @@ -712,7 +712,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/dns/tests/master_test.c b/lib/dns/tests/master_test.c index 55c415a84d4..a4389f296c6 100644 --- a/lib/dns/tests/master_test.c +++ b/lib/dns/tests/master_test.c @@ -644,7 +644,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/dns/tests/name_test.c b/lib/dns/tests/name_test.c index 161d2c4504a..5cb94f505ea 100644 --- a/lib/dns/tests/name_test.c +++ b/lib/dns/tests/name_test.c @@ -788,7 +788,7 @@ main(int argc, char **argv) { 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/dns/tests/nsec3_test.c b/lib/dns/tests/nsec3_test.c index dadb6688f6b..a71b3c908bf 100644 --- a/lib/dns/tests/nsec3_test.c +++ b/lib/dns/tests/nsec3_test.c @@ -189,7 +189,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/dns/tests/nsec3param_test.c b/lib/dns/tests/nsec3param_test.c index 3ae5da41684..65206bed7a1 100644 --- a/lib/dns/tests/nsec3param_test.c +++ b/lib/dns/tests/nsec3param_test.c @@ -296,7 +296,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/dns/tests/peer_test.c b/lib/dns/tests/peer_test.c index 9342ba0bf26..8f0759c555a 100644 --- a/lib/dns/tests/peer_test.c +++ b/lib/dns/tests/peer_test.c @@ -167,7 +167,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/dns/tests/private_test.c b/lib/dns/tests/private_test.c index 4da68a29da5..47d7dd261cc 100644 --- a/lib/dns/tests/private_test.c +++ b/lib/dns/tests/private_test.c @@ -232,7 +232,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/dns/tests/rbt_serialize_test.c b/lib/dns/tests/rbt_serialize_test.c index e04422c6ebd..71cc2903a61 100644 --- a/lib/dns/tests/rbt_serialize_test.c +++ b/lib/dns/tests/rbt_serialize_test.c @@ -481,7 +481,7 @@ main(int argc, char **argv) { 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/dns/tests/rbt_test.c b/lib/dns/tests/rbt_test.c index c17b503f8f8..08276827b70 100644 --- a/lib/dns/tests/rbt_test.c +++ b/lib/dns/tests/rbt_test.c @@ -1382,7 +1382,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/dns/tests/rdata_test.c b/lib/dns/tests/rdata_test.c index e44b2f1cabb..9cf32c2849e 100644 --- a/lib/dns/tests/rdata_test.c +++ b/lib/dns/tests/rdata_test.c @@ -2704,7 +2704,7 @@ main(int argc, char **argv) { 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/dns/tests/rdataset_test.c b/lib/dns/tests/rdataset_test.c index 87e773a4682..72b6fd39463 100644 --- a/lib/dns/tests/rdataset_test.c +++ b/lib/dns/tests/rdataset_test.c @@ -138,7 +138,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/dns/tests/rdatasetstats_test.c b/lib/dns/tests/rdatasetstats_test.c index 3cf15f1b826..a6df467e8e2 100644 --- a/lib/dns/tests/rdatasetstats_test.c +++ b/lib/dns/tests/rdatasetstats_test.c @@ -304,7 +304,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/dns/tests/resolver_test.c b/lib/dns/tests/resolver_test.c index 81457284a3a..66f7c96b834 100644 --- a/lib/dns/tests/resolver_test.c +++ b/lib/dns/tests/resolver_test.c @@ -220,7 +220,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/dns/tests/result_test.c b/lib/dns/tests/result_test.c index 44605edad20..b21828cbe58 100644 --- a/lib/dns/tests/result_test.c +++ b/lib/dns/tests/result_test.c @@ -125,7 +125,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/dns/tests/rsa_test.c b/lib/dns/tests/rsa_test.c index 851a4220bfd..74b7bf5961e 100644 --- a/lib/dns/tests/rsa_test.c +++ b/lib/dns/tests/rsa_test.c @@ -231,7 +231,7 @@ main(void) { int main(void) { printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */ diff --git a/lib/dns/tests/sigs_test.c b/lib/dns/tests/sigs_test.c index cff7cd908c2..9c59afa770e 100644 --- a/lib/dns/tests/sigs_test.c +++ b/lib/dns/tests/sigs_test.c @@ -454,7 +454,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/dns/tests/time_test.c b/lib/dns/tests/time_test.c index d6edf74de3e..3dc636b63b6 100644 --- a/lib/dns/tests/time_test.c +++ b/lib/dns/tests/time_test.c @@ -210,7 +210,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/dns/tests/tsig_test.c b/lib/dns/tests/tsig_test.c index 897f0f741fe..6c8e6a3c056 100644 --- a/lib/dns/tests/tsig_test.c +++ b/lib/dns/tests/tsig_test.c @@ -597,7 +597,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/dns/tests/update_test.c b/lib/dns/tests/update_test.c index f15d015360e..8036229a949 100644 --- a/lib/dns/tests/update_test.c +++ b/lib/dns/tests/update_test.c @@ -321,7 +321,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/dns/tests/zonemgr_test.c b/lib/dns/tests/zonemgr_test.c index e508a2a1d1b..ca7559e1817 100644 --- a/lib/dns/tests/zonemgr_test.c +++ b/lib/dns/tests/zonemgr_test.c @@ -257,7 +257,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/dns/tests/zt_test.c b/lib/dns/tests/zt_test.c index bd1a325ea93..7945a0bd9ec 100644 --- a/lib/dns/tests/zt_test.c +++ b/lib/dns/tests/zt_test.c @@ -368,7 +368,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/irs/tests/resconf_test.c b/lib/irs/tests/resconf_test.c index 99876e8a76d..8ca9762bffa 100644 --- a/lib/irs/tests/resconf_test.c +++ b/lib/irs/tests/resconf_test.c @@ -133,7 +133,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/aes_test.c b/lib/isc/tests/aes_test.c index b808cd4531b..919c572786a 100644 --- a/lib/isc/tests/aes_test.c +++ b/lib/isc/tests/aes_test.c @@ -241,7 +241,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/buffer_test.c b/lib/isc/tests/buffer_test.c index 228b0893187..a50431ce813 100644 --- a/lib/isc/tests/buffer_test.c +++ b/lib/isc/tests/buffer_test.c @@ -343,7 +343,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/counter_test.c b/lib/isc/tests/counter_test.c index 9642059ef65..52ee95bd690 100644 --- a/lib/isc/tests/counter_test.c +++ b/lib/isc/tests/counter_test.c @@ -97,7 +97,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/crc64_test.c b/lib/isc/tests/crc64_test.c index 8fd22aca153..0ee45441b2e 100644 --- a/lib/isc/tests/crc64_test.c +++ b/lib/isc/tests/crc64_test.c @@ -100,7 +100,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/errno_test.c b/lib/isc/tests/errno_test.c index 4d66d9efd87..47fe24b9b73 100644 --- a/lib/isc/tests/errno_test.c +++ b/lib/isc/tests/errno_test.c @@ -115,7 +115,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/file_test.c b/lib/isc/tests/file_test.c index 74166e61d20..d1d6a956e74 100644 --- a/lib/isc/tests/file_test.c +++ b/lib/isc/tests/file_test.c @@ -146,7 +146,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/hash_test.c b/lib/isc/tests/hash_test.c index 3444f9f0ca0..6d4918b2182 100644 --- a/lib/isc/tests/hash_test.c +++ b/lib/isc/tests/hash_test.c @@ -106,7 +106,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/heap_test.c b/lib/isc/tests/heap_test.c index 2ac3a546c2f..fb61f3fd994 100644 --- a/lib/isc/tests/heap_test.c +++ b/lib/isc/tests/heap_test.c @@ -110,7 +110,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/hmac_test.c b/lib/isc/tests/hmac_test.c index 1cf40026950..cfd3ae3c9b5 100644 --- a/lib/isc/tests/hmac_test.c +++ b/lib/isc/tests/hmac_test.c @@ -941,7 +941,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/ht_test.c b/lib/isc/tests/ht_test.c index cc8724546be..c139ca8de40 100644 --- a/lib/isc/tests/ht_test.c +++ b/lib/isc/tests/ht_test.c @@ -353,7 +353,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/lex_test.c b/lib/isc/tests/lex_test.c index 34ae9ba9bdb..059d323bf0f 100644 --- a/lib/isc/tests/lex_test.c +++ b/lib/isc/tests/lex_test.c @@ -136,7 +136,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/md_test.c b/lib/isc/tests/md_test.c index a41471a05a9..260fda861e0 100644 --- a/lib/isc/tests/md_test.c +++ b/lib/isc/tests/md_test.c @@ -579,7 +579,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/mem_test.c b/lib/isc/tests/mem_test.c index e096c54c671..3b7c3e9ee18 100644 --- a/lib/isc/tests/mem_test.c +++ b/lib/isc/tests/mem_test.c @@ -533,7 +533,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/netaddr_test.c b/lib/isc/tests/netaddr_test.c index 6a019041636..9ec2cb894de 100644 --- a/lib/isc/tests/netaddr_test.c +++ b/lib/isc/tests/netaddr_test.c @@ -151,7 +151,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/parse_test.c b/lib/isc/tests/parse_test.c index 5fe9e013a7e..68f08d97ef7 100644 --- a/lib/isc/tests/parse_test.c +++ b/lib/isc/tests/parse_test.c @@ -88,7 +88,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/pool_test.c b/lib/isc/tests/pool_test.c index 45c3b9c1d4d..9ead94a5923 100644 --- a/lib/isc/tests/pool_test.c +++ b/lib/isc/tests/pool_test.c @@ -186,7 +186,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/quota_test.c b/lib/isc/tests/quota_test.c index 99ba08f75bf..1def0c74563 100644 --- a/lib/isc/tests/quota_test.c +++ b/lib/isc/tests/quota_test.c @@ -348,7 +348,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/radix_test.c b/lib/isc/tests/radix_test.c index 2149ae17155..d4448048027 100644 --- a/lib/isc/tests/radix_test.c +++ b/lib/isc/tests/radix_test.c @@ -116,7 +116,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/random_test.c b/lib/isc/tests/random_test.c index 4b6b643967e..7161cd96a9d 100644 --- a/lib/isc/tests/random_test.c +++ b/lib/isc/tests/random_test.c @@ -885,7 +885,7 @@ main(int argc, char **argv) { 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/regex_test.c b/lib/isc/tests/regex_test.c index 7fe4bcb2de5..5d7ae5e5b49 100644 --- a/lib/isc/tests/regex_test.c +++ b/lib/isc/tests/regex_test.c @@ -2366,7 +2366,7 @@ main(int argc, char **argv) { 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/result_test.c b/lib/isc/tests/result_test.c index f1242dc668b..248dea6f8c2 100644 --- a/lib/isc/tests/result_test.c +++ b/lib/isc/tests/result_test.c @@ -124,7 +124,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/safe_test.c b/lib/isc/tests/safe_test.c index fbe3190e176..b4de3be002d 100644 --- a/lib/isc/tests/safe_test.c +++ b/lib/isc/tests/safe_test.c @@ -99,7 +99,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/siphash_test.c b/lib/isc/tests/siphash_test.c index 1657fa5b0d1..3cc85fac904 100644 --- a/lib/isc/tests/siphash_test.c +++ b/lib/isc/tests/siphash_test.c @@ -175,7 +175,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/sockaddr_test.c b/lib/isc/tests/sockaddr_test.c index 59ed4c63532..c944b9bf1c3 100644 --- a/lib/isc/tests/sockaddr_test.c +++ b/lib/isc/tests/sockaddr_test.c @@ -180,7 +180,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/socket_test.c b/lib/isc/tests/socket_test.c index f894393ca0b..47e98a7b465 100644 --- a/lib/isc/tests/socket_test.c +++ b/lib/isc/tests/socket_test.c @@ -824,7 +824,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/symtab_test.c b/lib/isc/tests/symtab_test.c index 85b0dabaf9d..6ac0204c780 100644 --- a/lib/isc/tests/symtab_test.c +++ b/lib/isc/tests/symtab_test.c @@ -163,7 +163,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/task_test.c b/lib/isc/tests/task_test.c index f4a44a12c57..0aad028fb16 100644 --- a/lib/isc/tests/task_test.c +++ b/lib/isc/tests/task_test.c @@ -1598,7 +1598,7 @@ main(int argc, char **argv) { 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/taskpool_test.c b/lib/isc/tests/taskpool_test.c index 5b97a0d7659..195ac4b44f0 100644 --- a/lib/isc/tests/taskpool_test.c +++ b/lib/isc/tests/taskpool_test.c @@ -201,7 +201,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/tcp_quota_test.c b/lib/isc/tests/tcp_quota_test.c index 849213b6772..17bec56f241 100644 --- a/lib/isc/tests/tcp_quota_test.c +++ b/lib/isc/tests/tcp_quota_test.c @@ -731,7 +731,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/tcp_test.c b/lib/isc/tests/tcp_test.c index a27ab80ebbf..7e911fe9480 100644 --- a/lib/isc/tests/tcp_test.c +++ b/lib/isc/tests/tcp_test.c @@ -1042,7 +1042,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/tcpdns_test.c b/lib/isc/tests/tcpdns_test.c index 21459645921..f576fe8bd0c 100644 --- a/lib/isc/tests/tcpdns_test.c +++ b/lib/isc/tests/tcpdns_test.c @@ -873,7 +873,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/time_test.c b/lib/isc/tests/time_test.c index 1bc03917441..e16fd3e4ed5 100644 --- a/lib/isc/tests/time_test.c +++ b/lib/isc/tests/time_test.c @@ -315,7 +315,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/timer_test.c b/lib/isc/tests/timer_test.c index d29241fe270..4d02ff3b74e 100644 --- a/lib/isc/tests/timer_test.c +++ b/lib/isc/tests/timer_test.c @@ -647,7 +647,7 @@ main(int argc, char **argv) { 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/udp_test.c b/lib/isc/tests/udp_test.c index a1a99314e26..00210a18e9e 100644 --- a/lib/isc/tests/udp_test.c +++ b/lib/isc/tests/udp_test.c @@ -886,7 +886,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/isccc/tests/result_test.c b/lib/isccc/tests/result_test.c index fd900201188..341088a04ba 100644 --- a/lib/isccc/tests/result_test.c +++ b/lib/isccc/tests/result_test.c @@ -76,7 +76,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/isccfg/tests/duration_test.c b/lib/isccfg/tests/duration_test.c index 67777aa14b8..3c5d45092c7 100644 --- a/lib/isccfg/tests/duration_test.c +++ b/lib/isccfg/tests/duration_test.c @@ -195,7 +195,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/isccfg/tests/parser_test.c b/lib/isccfg/tests/parser_test.c index bd441204972..79e9f505416 100644 --- a/lib/isccfg/tests/parser_test.c +++ b/lib/isccfg/tests/parser_test.c @@ -282,7 +282,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/ns/tests/listenlist_test.c b/lib/ns/tests/listenlist_test.c index 7e48e4c6fd6..1a7f46451a4 100644 --- a/lib/ns/tests/listenlist_test.c +++ b/lib/ns/tests/listenlist_test.c @@ -130,9 +130,9 @@ main(void) { int main(void) { - printf("1..0 # Skip cmocka not available\n"); + printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */ diff --git a/lib/ns/tests/notify_test.c b/lib/ns/tests/notify_test.c index 61d4a251eb0..5fbea8966e1 100644 --- a/lib/ns/tests/notify_test.c +++ b/lib/ns/tests/notify_test.c @@ -156,9 +156,9 @@ main(void) { int main(void) { - printf("1..0 # Skip cmocka not available\n"); + printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */ diff --git a/lib/ns/tests/plugin_test.c b/lib/ns/tests/plugin_test.c index 289ea2e2bda..ada102a99e9 100644 --- a/lib/ns/tests/plugin_test.c +++ b/lib/ns/tests/plugin_test.c @@ -202,7 +202,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/ns/tests/query_test.c b/lib/ns/tests/query_test.c index cb7c4b82f74..6630ee33697 100644 --- a/lib/ns/tests/query_test.c +++ b/lib/ns/tests/query_test.c @@ -1522,9 +1522,9 @@ main(void) { int main(void) { - printf("1..0 # Skip cmocka not available\n"); + printf("1..0 # Skipped: cmocka not available\n"); - return (0); + return (SKIPPED_TEST_EXIT_CODE); } #endif /* HAVE_CMOCKA */