Use BIND 9.17 preprocessor macro to skip unit test

BIND 9.17 changed exit code of skipped test to meet Automake
expectations in fa505bfb0e7623d7cfc94ae15a0246ae71000904. BIND 9.16 was
not rewritten to Automake, but for consistency reasons, the same
SKIPPED_TEST_EXIT_CODE preprocessor macro is used (though the actual
exit code differs from the one in BIND 9.17).

(cherry picked from commit fa505bfb0e7623d7cfc94ae15a0246ae71000904)

diff --git a/config.h.in b/config.h.in
index 48d41d6cc670a62763edb0803129f7a35a80995e..ec2f36042d65b93db368dac9bb9d3e627ba8c035 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -546,6 +546,9 @@
    your system. */
 #undef PTHREAD_CREATE_JOINABLE
 
+/* Exit code for skipped tests */
+#undef SKIPPED_TEST_EXIT_CODE
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

diff --git a/configure b/configure
index 29573e12981e3233b7579a9dab89b399aba0dbd3..de9c1bd4797ca23e6df88010bf499bb9e9f60c49 100755 (executable)
--- a/configure
+++ b/configure
@@ -21931,6 +21931,10 @@ esac
 
 
 
+
+$as_echo "#define SKIPPED_TEST_EXIT_CODE 0" >>confdefs.h
+
+
 #
 # Check for kyua execution engine if CMocka was requested
 # and bail out if execution engine was not found

diff --git a/configure.ac b/configure.ac
index 12d200a070206d92054890669601c3bfb5006a92..6a85692854f42e0ed2a7b8e1a82332d40671dda7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2234,6 +2234,8 @@ AS_CASE([$with_cmocka],
 AC_SUBST([CMOCKA_CFLAGS])
 AC_SUBST([CMOCKA_LIBS])
 
+AC_DEFINE([SKIPPED_TEST_EXIT_CODE], [0], [Exit code for skipped tests])
+
 #
 # Check for kyua execution engine if CMocka was requested
 # and bail out if execution engine was not found

diff --git a/lib/dns/tests/acl_test.c b/lib/dns/tests/acl_test.c
index 93758ad252dee6e18d44610ecfecff0a91dfd42d..f04b8a8e87df6abb95b6e0358c352a748f5c93f5 100644 (file)
--- 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 0d348999bf73ffb4b5e6ca81e77b394494d1f8d1..c12e90ee1c159fddc812e1a89c0e9f777e0b88e5 100644 (file)
--- 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 3246d6081410724ed5cce87ee8e64fcd037e8889..a62496f6ebd4dade7dd911ec3520cb47746a300a 100644 (file)
--- 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 e6ae81ea3647438c6e6f3e11b4064083aa456a74..13a4976d458f3aa0f81b9e2e3b4b3f365c69c704 100644 (file)
--- 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 0891bf19cd9ae29a8a55ee4bd83002f04ee0158a..d90316504f5a3386fe13d5d9b8f9e3185109d679 100644 (file)
--- 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 176f93876386a0a8a41614ae4581db3bc54d8dd9..db7cac9b6ae2260316ac355ce7732d9fdf5e55ec 100644 (file)
--- 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 b8cc954c88b9e2cf4bd254134cfc4e6852751250..7bd0712d56a08f032eb1d56dc24f9c4a5a82d546 100644 (file)
--- 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/dnstap_test.c b/lib/dns/tests/dnstap_test.c
index b3858dd5062b3512009d635d90ec5c42db558459..fe8e140791ed294cf3e1b8aae83ad1196d4dcb09 100644 (file)
--- a/lib/dns/tests/dnstap_test.c
+++ b/lib/dns/tests/dnstap_test.c
@@ -393,7 +393,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 4cffaae0a84f0adff1074411e70c1ebf2a8f2cf9..288ac5b7b7114d68fa3b7c1e3fd491c2be765c1d 100644 (file)
--- 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 c3a34183d96eac0fa19ea3acf7b2a7a563abbd22..20adcbba336fb6337fe496c2f4d4a9c0d93ac390 100644 (file)
--- a/lib/dns/tests/geoip_test.c
+++ b/lib/dns/tests/geoip_test.c
@@ -426,7 +426,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 06e180abccf2509e4c7832fac4ba8cbdb275fc0d..0376531badcb5255b838a16177a58be956c10361 100644 (file)
--- 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 b74e507520e342d801296a23d9532c2db2011ace..edc6df3d3ec5b26eecd4d9a193bc2cc7926b527b 100644 (file)
--- a/lib/dns/tests/master_test.c
+++ b/lib/dns/tests/master_test.c
@@ -625,7 +625,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 161d2c4504acd5ff212f4149c84ea3184a0b800d..5cb94f505ea6586b3317285fbc5ce7c2da1931e2 100644 (file)
--- 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 dadb6688f6b54f73d1e0cbd9a920cc7af2596b26..a71b3c908bfc18948a5e6ad1198663ebc7043b14 100644 (file)
--- 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 3ae5da4168422e0d8d84493ee08f63dfb65564d4..65206bed7a16fc8eba54769baaac43e4adee74e0 100644 (file)
--- 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 9342ba0bf26c1f9b5d6119a385cb3cf6f67d9283..8f0759c555a5387c511dd21e56665c1addfcdb49 100644 (file)
--- 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 4da68a29da52c3abdddafd89f179d4b743e6aa29..47d7dd261cca98ec73e5f6707e92af5f25ff114e 100644 (file)
--- 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 e04422c6ebdf281940b32cb8cafa0edd811bc040..71cc2903a6122f686e56d2f56ab26b41905200f4 100644 (file)
--- 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 c17b503f8f8b16ba5b0dfa5e6a89b41cf6ddc970..08276827b70c10956005e698aaf1e38216c7e560 100644 (file)
--- 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 e44b2f1cabbc5a88e7f8f4871c2ad9b9b162f023..9cf32c2849e7ecf3d6abf35829de678948555584 100644 (file)
--- 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 87e773a468221fcc545d2a9020077c8619c14ac6..72b6fd39463b910001dce4f6c4a1e741968c4538 100644 (file)
--- 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 3cf15f1b826ee47b7a2bb295d226d458717fae7a..a6df467e8e21a6e824b570d140731560f886e577 100644 (file)
--- 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 81457284a3ae20fd13eba9ae45c456acfeabf469..66f7c96b834f975814fd0a02a9c9da4e5dfd3d5e 100644 (file)
--- 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 44605edad20940dcc894373368a7240cef750442..b21828cbe5853d7b75f9b60a6d9aac0514db2029 100644 (file)
--- 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 851a4220bfd2d306204b3e6e831cd275baa35a36..74b7bf5961e36cba52a7f189f1ebd0c6afe629eb 100644 (file)
--- 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 cff7cd908c2842260eb453fc07047309d3413210..9c59afa770ea12c19d1a04f1437c0b9c15547221 100644 (file)
--- 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 d6edf74de3e09606ecc6c8240fc2aefb3d9ec288..3dc636b63b6bff18e34d457fa3507a82ba7c06a2 100644 (file)
--- 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 897f0f741fecb5646d78590c6b7c13d84adda620..6c8e6a3c0562a4d3ae5a9a6559c66e2d8820924f 100644 (file)
--- 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 bc789b2be29d5ffd97bba8f780d4e0c9026529b3..a4ca6a9240698b25b731cb3154393b28985cb8b3 100644 (file)
--- a/lib/dns/tests/update_test.c
+++ b/lib/dns/tests/update_test.c
@@ -344,7 +344,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 733d607996209156ef60660951800b57e84f2a21..edc3d5324a360d225d6b3979a47745acdd8998e2 100644 (file)
--- 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 bd1a325ea9323dd8c678f96e92d0255aee4a993b..7945a0bd9ec4dd46dc0cb682246e8d0150d88e5d 100644 (file)
--- 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 d3cd8cd70d49f2d60cff87dfdc935c437338363f..ff4fc4df74cd93260d1dd36c02b1c7ae85af6623 100644 (file)
--- a/lib/irs/tests/resconf_test.c
+++ b/lib/irs/tests/resconf_test.c
@@ -134,7 +134,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 b808cd4531b2022c78e2be11d3816127fce89936..919c572786a8fdf69f07b66e57bda3d5b617db40 100644 (file)
--- 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 228b0893187067bf1382b9777281576e710579fb..a50431ce813a5f6e18735fe85b74b6f290010c12 100644 (file)
--- 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 9642059ef65b06d66de4a1a3458c5d02710cd65a..52ee95bd690f234c81c7b0feee9487d520a4556e 100644 (file)
--- 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 8fd22aca1536f37567e9447296e293fb529fafd6..0ee45441b2e2150719cf64d3bd12506020e6da68 100644 (file)
--- 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 4d66d9efd8786b50bdcc6c56d2b0a18761cdaf70..47fe24b9b73738fe81607b0cabd59f2b1bae2135 100644 (file)
--- 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 2fa2a23059a0329aa5991239e8b1b9079a83d1ac..cc8d1383cf2d41ef10d3c8fd0e03d38b1a358143 100644 (file)
--- 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 3444f9f0ca0e17d500760f7a106c93edd85c6d5e..6d4918b218274b5b7fada766e13f276d0338df7c 100644 (file)
--- 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 2ac3a546c2f0c1995fdddb7f5a67e0c17382ab45..fb61f3fd994690ccf7a2923a50e9c837c5ca6a37 100644 (file)
--- 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 1cf400269507d77b23ff1f3cbad460be0dceca6d..cfd3ae3c9b5b5196d12c2a508d57b2ae9cc27f1a 100644 (file)
--- 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 4b3e52221a9ff6cbadc8b7831cf052dd0e9d95a5..6a8e3198530a4daca275e4b36eb0f65ce7004d89 100644 (file)
--- 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 34ae9ba9bdb38a57e207fcc8a8705a6051e4662c..059d323bf0f86078739696cf648f92d47812de9e 100644 (file)
--- 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 a41471a05a9b87ece5003216b3f8854d70d61c31..260fda861e0533704a21c83088060ceffe87b330 100644 (file)
--- 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 e096c54c67171ff727ed27a72078d34c0d40e87d..3b7c3e9ee1872ba0e504fcc3f22ba02af44f57cd 100644 (file)
--- 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 6a0190416365bd7feec89809269a0a994ec6c334..9ec2cb894de55c96a35d108fc81347ae102ebfc8 100644 (file)
--- 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 5fe9e013a7e2b1b737e7d79cf3e39682de4e6eac..68f08d97ef7cb81cdbd2401f26408795c287ff53 100644 (file)
--- 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 45c3b9c1d4d3f8fbae3604d04fea582c0171bc6b..9ead94a59235854eadb4668e49842dc18a8e59d6 100644 (file)
--- 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 99ba08f75bfa004e9f31788e2646129586d08c75..1def0c74563c9e5bba38aaa6a0085367e6fb3620 100644 (file)
--- 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 2149ae171555887f6de3db2e1a558af040f96e00..d4448048027c5d30c60d089e3177309195c16d19 100644 (file)
--- 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 4b6b643967e6c574e7b7c804f73104b3ae52ba71..7161cd96a9d3e921c56a6e238400896d7ddb2de6 100644 (file)
--- 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 7fe4bcb2de5ed782fdcc745185e3569dec8818d8..5d7ae5e5b490cdef139aea8ca7580a454aa8c258 100644 (file)
--- 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 f1242dc668b92133c3d50d269238b0618e189e8b..248dea6f8c2b55a05c059bc96a2e38b003349590 100644 (file)
--- 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 fbe3190e17634bf8eacb89ece09ca050b6b22f7e..b4de3be002d3135120aabacc5660ae64f748226a 100644 (file)
--- 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 1657fa5b0d1f37ec9ec98e727be22147ee230960..3cc85fac904f670cb5136b7bc2af3efaea514d41 100644 (file)
--- 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 59ed4c635326529ef17f254d583a2b388fd2babf..c944b9bf1c39cef0050d3e512a3ffde57f976214 100644 (file)
--- 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 f894393ca0b684b1fc1e52dfaa1840accaac17e8..47e98a7b4654a8036e6f0542b3847ff1a6719379 100644 (file)
--- 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 85b0dabaf9d171368061608931a4a6c814c57378..6ac0204c78007a3ed943f83738f88e5604743734 100644 (file)
--- 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 f4a44a12c57aeb6e3905925c98c093d8b83c60ad..0aad028fb16f570d5d4f61cfe21b92c062a35bc3 100644 (file)
--- 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 5b97a0d7659c16811752021c055216b75b36f7f2..195ac4b44f0f5bc72fafdecdea5470184844d200 100644 (file)
--- 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 4943ffef7c84fceed6a509240157fbb176daa15c..a6777cb1fcb0b6c4c90c1b35c80b6dbc01c3a2f6 100644 (file)
--- a/lib/isc/tests/tcp_quota_test.c
+++ b/lib/isc/tests/tcp_quota_test.c
@@ -730,7 +730,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 11ce8a10802e6a3292a0b4776ac7338a97db8cf5..7864e8745508d29ef503eb3bb22dc8659a8146d0 100644 (file)
--- 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 6393860df2fde84566db7bfc411cc28fe0c9eda1..8f1fb1bbbffeb58be37789240bc29b5ab293cda8 100644 (file)
--- a/lib/isc/tests/tcpdns_test.c
+++ b/lib/isc/tests/tcpdns_test.c
@@ -870,7 +870,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 1bc039174415c88fecdd7d8eab22435c6587c4cf..e16fd3e4ed57f59dfe0ed747d06cd221f0d676d6 100644 (file)
--- 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 d29241fe270300199a1a2ab74363ff5f553c2302..4d02ff3b74ed6a77180d8e0770babeceaa5c89b6 100644 (file)
--- 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 15a3042e692ea556b45572d4b276e0a4de4083ea..06ea7f1f2d0d1f8eae2c5c83b191055b408a6ffb 100644 (file)
--- 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 fd90020118858221b43373ef54b8f7104e3f8670..341088a04baccfe29b1ea0132f0483743a589a1e 100644 (file)
--- 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 eac793429bd3199c5273ae9a131ad7ad3cac3767..faecb470c2f4c85592bf2c9bf1d34856368383ae 100644 (file)
--- 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 f774d7cd56087414a9975368911719d80a55ed73..a35847ebfb38dda68556b21d78dca90cc54967d7 100644 (file)
--- 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 7e48e4c6fd6fe73d69101fa05f69a3b9303a2adb..1a7f46451a42aca0d0e95fa00a97a03c60fc922c 100644 (file)
--- 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 b868e6aea427bcf6cc94a6185b2057b9ef10eef9..a9575e507ad6dc4345586cc013c2946f8ebfe170 100644 (file)
--- a/lib/ns/tests/notify_test.c
+++ b/lib/ns/tests/notify_test.c
@@ -162,9 +162,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 62725e0fcd01195416297857ee2a91dbb2157934..e1f93e55b206b6427bbf1e3bc50a92f3593398e2 100644 (file)
--- a/lib/ns/tests/plugin_test.c
+++ b/lib/ns/tests/plugin_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/ns/tests/query_test.c b/lib/ns/tests/query_test.c
index 6c10b99cb79e1dcc1070f975dbcfa614318b8467..6c147d42bcd2277a0a81ad4829ffd84505e5ad93 100644 (file)
--- a/lib/ns/tests/query_test.c
+++ b/lib/ns/tests/query_test.c
@@ -623,9 +623,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 */