From: Niels Möller <nisse@lysator.liu.se>
Date: Sun, 23 Jan 2022 13:21:48 +0000 (+0100)
Subject: Arrange so that GMP or mini-gmp is always available for tests.
X-Git-Tag: nettle_3.8_release_20220602~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbf178c0f2c03fa713823a16f5bafc15c5a394b7;p=thirdparty%2Fnettle.git

Arrange so that GMP or mini-gmp is always available for tests.
---

diff --git a/ChangeLog b/ChangeLog
index fff81940..ec459ea7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-01-23  Niels Möller  <nisse@lysator.liu.se>
+
+	Arrange so that GMP or mini-gmp is always available for tests.
+	* testsuite/testutils.h [!WITH_HOGWEED]: Include mini-gmp.h.
+	* testsuite/testutils.c [!WITH_HOGWEED]: Include mini-gmp.c.
+
 2022-01-21  Niels Möller  <nisse@lysator.liu.se>
 
 	* powerpc64/ecc-secp192r1-modp.asm: New file, contributed by
diff --git a/testsuite/testutils.c b/testsuite/testutils.c
index b3ca8043..0d91d8ef 100644
--- a/testsuite/testutils.c
+++ b/testsuite/testutils.c
@@ -2063,5 +2063,8 @@ test_ecc_get_ga (unsigned curve, mp_limb_t *rp)
   mpz_clear (y);
 }
 
-#endif /* WITH_HOGWEED */
+#else /* !WITH_HOGWEED */
+/* Make sure either gmp or mini-gmp is available for tests. */
+#include "mini-gmp.c"
+#endif /* !WITH_HOGWEED */
 
diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index cb4423e4..3e239787 100644
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -30,7 +30,10 @@
 /* Undo dsa-compat name mangling */
 #undef dsa_generate_keypair
 #define dsa_generate_keypair nettle_dsa_generate_keypair
-#endif /* WITH_HOGWEED */
+#else /* !WITH_HOGWEED */
+/* Make sure either gmp or mini-gmp is available for tests. */
+#include "mini-gmp.h"
+#endif /* !WITH_HOGWEED */
 
 #include "nettle-meta.h"