chg: dev: Support compilation with cmocka 2.0.0+

The `assert_in_range()` function was deprecated in favor of
`assert_int_in_range()` and `assert_uint_in_range()`. Add compatibility
shims for cmocka<2.0.0 and use the new functions.

Closes #5699

Merge branch '5699-support-cmocka-2.0.0' into 'main'

See merge request isc-projects/bind9!11412

tests/dns/db_test.c

@@ -178,7 +178,7 @@ ISC_LOOP_TEST_IMPL(dns_dbfind_staleok) {
 		count = 0;
 		do {
 			count++;
-			assert_in_range(count, 1, 21); /* loop sanity */
+			assert_int_in_range(count, 1, 21); /* loop sanity */
 			assert_int_equal(rdataset.attributes.stale, false);
 			assert_true(rdataset.ttl > 0);
 			dns_db_detachnode(&node);
@@ -211,7 +211,8 @@ ISC_LOOP_TEST_IMPL(dns_dbfind_staleok) {
 			count = 0;
 			do {
 				count++;
-				assert_in_range(count, 0, 49); /* loop sanity */
+				assert_int_in_range(count, 0, 49); /* loop
+								      sanity */
 				assert_int_equal(result, ISC_R_SUCCESS);
 				assert_int_equal(rdataset.attributes.stale,
 						 true);
@@ -229,7 +230,7 @@ ISC_LOOP_TEST_IMPL(dns_dbfind_staleok) {
 			 * usleep(100000) can be slightly less than 10ms so
 			 * allow the count to reach 11.
 			 */
-			assert_in_range(count, 1, 11);
+			assert_int_in_range(count, 1, 11);
 			assert_int_equal(result, ISC_R_NOTFOUND);
 			break;
 		case 2:

tests/dns/ede_test.c

@@ -54,7 +54,7 @@ dns_ede_test_equals(const ede_test_expected_t *expected, size_t expected_count,
 		uint16_t code;
 		const unsigned char *txt;
 
-		assert_in_range(count, 0, expected_count);
+		assert_uint_in_range(count, 0, expected_count);
 		assert_int_equal(edns->code, DNS_OPT_EDE);
 
 		code = ISC_U8TO16_BE(edns->value);

tests/dns/qp_test.c

@@ -283,7 +283,7 @@ ISC_RUN_TEST_IMPL(qpkey_sort) {
 static void
 check_leaf(void *uctx, void *pval, uint32_t ival) {
 	uint32_t *items = uctx;
-	assert_in_range(ival, 1, ITER_ITEMS - 1);
+	assert_uint_in_range(ival, 1, ITER_ITEMS - 1);
 	assert_ptr_equal(items + ival, pval);
 }
 
@@ -353,7 +353,7 @@ ISC_RUN_TEST_IMPL(qpiter) {
 		uint32_t prev = 0;
 		dns_qpiter_init(qp, &qpi);
 		while (dns_qpiter_next(&qpi, &pval, &ival) == ISC_R_SUCCESS) {
-			assert_in_range(ival, prev + 1, ITER_ITEMS - 1);
+			assert_uint_in_range(ival, prev + 1, ITER_ITEMS - 1);
 			assert_int_equal(ival, item[ival]);
 			assert_ptr_equal(pval, &item[ival]);
 			order[inserted++] = ival;

tests/dns/resolver_test.c

@@ -163,7 +163,7 @@ ISC_LOOP_TEST_IMPL(settimeout_belowmin) {
 	dns_resolver_settimeout(resolver, 300);
 
 	timeout = dns_resolver_gettimeout(resolver);
-	assert_in_range(timeout, default_timeout, 3999999);
+	assert_uint_in_range(timeout, default_timeout, 3999999);
 
 	destroy_resolver(&resolver);
 	isc_loopmgr_shutdown();
@@ -180,7 +180,7 @@ ISC_LOOP_TEST_IMPL(settimeout_overmax) {
 	dns_resolver_settimeout(resolver, 4000000);
 
 	timeout = dns_resolver_gettimeout(resolver);
-	assert_in_range(timeout, default_timeout, 3999999);
+	assert_uint_in_range(timeout, default_timeout, 3999999);
 
 	destroy_resolver(&resolver);
 	isc_loopmgr_shutdown();

tests/include/tests/isc.h

@@ -72,6 +72,16 @@ file_path_to_groupname(const char *path, char *out, size_t outlen);
 #define TESTS_DIR "./"
 #endif
 
+/* cmocka<2.0.0 compatibility */
+#ifndef assert_int_in_range
+#define assert_int_in_range(value, min, max) \
+	assert_in_range((value), (min), (max))
+#endif
+#ifndef assert_uint_in_range
+#define assert_uint_in_range(value, min, max) \
+	assert_in_range((value), (min), (max))
+#endif
+
 /* clang-format off */
 /* Copied from cmocka */
 #define ISC_TEST_ENTRY(name)				\

tests/isc/histo_test.c

@@ -214,9 +214,9 @@ ISC_RUN_TEST_IMPL(quantiles) {
 			uint i = (quantum + base - key) * 2;
 
 			/* check fenceposts */
-			assert_in_range(value[i - 0], lomin, himin);
-			assert_in_range(value[i - 1], lomid, himid);
-			assert_in_range(value[i - 2], lomax, himax);
+			assert_uint_in_range(value[i - 0], lomin, himin);
+			assert_uint_in_range(value[i - 1], lomid, himid);
+			assert_uint_in_range(value[i - 2], lomax, himax);
 
 			/* these tests can be slow */
 			if (isc_time_monotonic() > start + TIME_LIMIT) {

tests/isc/mem_test.c

@@ -474,7 +474,7 @@ ISC_RUN_TEST_IMPL(isc_mem_traceflag) {
 	assert_non_null(p);
 	p = strchr(p + 1, '\n');
 	assert_non_null(p);
-	assert_in_range(p, 0, buf + sizeof(buf) - 3);
+	assert_uint_in_range(p, 0, buf + sizeof(buf) - 3);
 	assert_memory_equal(p + 2, "ptr ", 4);
 	p = strchr(p + 1, '\n');
 	assert_non_null(p);

tests/isccfg/parser_test.c

@@ -149,7 +149,7 @@ ISC_RUN_TEST_IMPL(parse_buffer) {
 
 	/* Check log values (and, specifically, line numbers). */
 	logfilelen = ftell(logfile);
-	assert_in_range(logfilelen, 0, sizeof(logfilebuf));
+	assert_uint_in_range(logfilelen, 0, sizeof(logfilebuf));
 
 	fresult = fseek(logfile, 0, SEEK_SET);
 	assert_int_equal(fresult, 0);