From: Evan Hunt <each@isc.org>
Date: Wed, 24 Oct 2018 04:05:26 +0000 (-0700)
Subject: set HAVE_CMOCKA correctly when using --with-cmocka=yes
X-Git-Tag: v9.13.4~21^2~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f456e64736f53dcdef79ef404c1466510ac0911f;p=thirdparty%2Fbind9.git

set HAVE_CMOCKA correctly when using --with-cmocka=yes

(note: this is still broken if using --with-cmocka=path)
---

diff --git a/lib/isc/tests/crc64_test.c b/lib/isc/tests/crc64_test.c
index 8326dae0efe..187dcaff3e7 100644
--- a/lib/isc/tests/crc64_test.c
+++ b/lib/isc/tests/crc64_test.c
@@ -70,6 +70,7 @@ _crc64(const char *buf, size_t buflen,
 	assert_memory_equal(hex, result, (result?strlen(result):0));
 }
 
+/* 64-bit cyclic redundancy check */
 static void
 isc_crc64_test(void **state) {
 	UNUSED(state);
@@ -88,11 +89,10 @@ isc_crc64_test(void **state) {
 	       "81E5EB73C8E7874A", 1);
 }
 
-int main(void) {
+int
+main(void) {
 	const struct CMUnitTest tests[] = {
-		/* isc_hmac_init() */
 		cmocka_unit_test(isc_crc64_init_test),
-
 		cmocka_unit_test(isc_crc64_test),
 	};
 
@@ -103,7 +103,8 @@ int main(void) {
 
 #include <stdio.h>
 
-int main(void) {
+int
+main(void) {
 	printf("1..0 # Skipped: cmocka not available\n");
 	return (0);
 }
diff --git a/lib/isc/tests/hmac_test.c b/lib/isc/tests/hmac_test.c
index d8fa7be8fae..8cac0cfab76 100644
--- a/lib/isc/tests/hmac_test.c
+++ b/lib/isc/tests/hmac_test.c
@@ -918,7 +918,8 @@ isc_hmac_sha512_test(void **state) {
 		      1);
 }
 
-int main(void) {
+int
+main(void) {
 	const struct CMUnitTest tests[] = {
 		/* isc_hmac_new() */
 		cmocka_unit_test(isc_hmac_new_test),
@@ -954,7 +955,8 @@ int main(void) {
 
 #include <stdio.h>
 
-int main(void) {
+int
+main(void) {
 	printf("1..0 # Skipped: cmocka not available\n");
 	return (0);
 }
diff --git a/lib/isc/tests/md_test.c b/lib/isc/tests/md_test.c
index 55cd3b800c7..5ec2c873f9b 100644
--- a/lib/isc/tests/md_test.c
+++ b/lib/isc/tests/md_test.c
@@ -545,7 +545,8 @@ isc_md_sha512_test(void **state) {
 		    1);
 }
 
-int main(void) {
+int
+main(void) {
 	const struct CMUnitTest tests[] = {
 		/* isc_md_new() */
 		cmocka_unit_test(isc_md_new_test),
@@ -581,7 +582,8 @@ int main(void) {
 
 #include <stdio.h>
 
-int main(void) {
+int
+main(void) {
 	printf("1..0 # Skipped: cmocka not available\n");
 	return (0);
 }