Use WITH_HOGWEED instead of HAVE_LIBGMP for preprocessor conditionals.

diff --git a/ChangeLog b/ChangeLog
index 723524df007c9b656fc9ab1170813cbd78560697..8174ea492dadd6f93ba808953b05bc7284a28bd2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2014-06-25  Niels Möller  <nisse@lysator.liu.se>
 
+       * testsuite/bignum-test.c: Use WITH_HOGWEED instead of HAVE_LIBGMP
+       for preprocessor conditionals.
+       * testsuite/testutils.h: Likewise.
+       * testsuite/sexp-format-test.c: Likewise.
+
        * testsuite/ecdsa-keygen-test.c (test_main): Use printf,
        mpz_out_str and write_mpn instead of gmp_fprintf.
        * testsuite/ecdsa-sign-test.c (test_ecdsa): Likewise.

diff --git a/testsuite/bignum-test.c b/testsuite/bignum-test.c
index 31149304c43da73385527b6b9782010b4496de59..602554b539416be05128a50ec27224097415fdaa 100644 (file)
--- a/testsuite/bignum-test.c
+++ b/testsuite/bignum-test.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if HAVE_LIBGMP
+#if WITH_HOGWEED
 #include "bignum.h"
 
 static void
@@ -43,13 +43,13 @@ test_size(long x, unsigned size)
   ASSERT(nettle_mpz_sizeinbase_256_s(t) == size);
   mpz_clear(t);
 }
-#endif /* HAVE_LIBGMP */
+#endif /* WITH_HOGWEED */
 
 
 void
 test_main(void)
 {
-#if HAVE_LIBGMP
+#if WITH_HOGWEED
   test_size(0, 1);
   test_size(1, 1);
   test_size(0x7f, 1);
@@ -87,7 +87,7 @@ test_main(void)
   test_bignum("-8000", SHEX(  "8000"));
   test_bignum("-8001", SHEX("ff7fff"));
   
-#else /* !HAVE_LIBGMP */
+#else /* !WITH_HOGWEED */
   SKIP();
-#endif /* !HAVE_LIBGMP */
+#endif /* !WITH_HOGWEED */
 }

diff --git a/testsuite/sexp-format-test.c b/testsuite/sexp-format-test.c
index 548527969335819b683800cfcd030bb619e49d4d..22d86ba974706ad334fd6cf1abc5020fdbc3d3fa 100644 (file)
--- a/testsuite/sexp-format-test.c
+++ b/testsuite/sexp-format-test.c
@@ -3,7 +3,7 @@
 
 #include "buffer.h"
 
-#if HAVE_LIBGMP
+#if WITH_HOGWEED
 # include "bignum.h"
 #endif
 
@@ -132,7 +132,7 @@ test_main(void)
     nettle_buffer_clear(&buffer);
   }
   
-#if HAVE_LIBGMP
+#if WITH_HOGWEED
   {
     mpz_t x;
     mpz_t y;
@@ -162,5 +162,5 @@ test_main(void)
     mpz_clear(y);
     mpz_clear(z);
   }
-#endif /* HAVE_LIBGMP */
+#endif /* WITH_HOGWEED */
 }

diff --git a/testsuite/testutils.h b/testsuite/testutils.h
index 71b093d26ef57bae4c7030db57b3757038569cf2..4768f9964240389e6ad998aca235bffbdef34e3d 100644 (file)
--- a/testsuite/testutils.h
+++ b/testsuite/testutils.h
@@ -12,10 +12,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#if HAVE_LIBGMP
-# include "bignum.h"
-#endif
-
 #if WITH_HOGWEED
 # include "rsa.h"
 # include "dsa-compat.h"