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

diff --git a/ChangeLog b/ChangeLog
index fff819405e593232a30ba8d8706adf4d2ae295ff..ec459ea7c0aad957aa6a9099d4d1ac0283bc8b3e 100644 (file)
--- 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 b3ca8043847b5213f32f7c50321ba3244200b9fb..0d91d8ef26963100b7a55183c3b4ac13c374d355 100644 (file)
--- 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 cb4423e44a79c387aaad118ace62352a6c59bb90..3e239787c677b3818c6641dca1f6d291387134e0 100644 (file)
--- 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"