Enable ecc-mul-a-test, also with mini-gmp.

diff --git a/ChangeLog b/ChangeLog
index 88046b7ba71e4dff753f0b81f207be9d33cde094..f481ee40dc03ffb9b755e3561de75fb4d7ba98ff 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2014-10-03  Niels Möller  <nisse@lysator.liu.se>
 
-       * testsuite/ecc-redc-test.c [NETTLE_USE_MINI_GMP]: Enable test. 
+       * testsuite/ecc-redc-test.c [NETTLE_USE_MINI_GMP]: Enable test.
        (test_main): Replace gmp_fprintf calls.
+       * testsuite/ecc-mul-a-test.c: Likewise.
 
        * testsuite/ecc-modinv-test.c [NETTLE_USE_MINI_GMP]: Enable test.
        (ref_modinv): Use mpz_gcdext, instead of mpn_gcdext.

diff --git a/testsuite/ecc-mul-a-test.c b/testsuite/ecc-mul-a-test.c
index e1958a1e106d6b157f7fed6ca38f35d3f8cbf3a8..b206b8484e0a34c9ee5672d415c7c957ea161c35 100644 (file)
--- a/testsuite/ecc-mul-a-test.c
+++ b/testsuite/ecc-mul-a-test.c
@@ -1,13 +1,5 @@
 #include "testutils.h"
 
-#if NETTLE_USE_MINI_GMP
-void
-test_main (void)
-{
-  SKIP();
-}
-#else /* ! NETTLE_USE_MINI_GMP */
-
 void
 test_main (void)
 {
@@ -80,15 +72,23 @@ test_main (void)
 
          if (mpn_cmp (p, q, 2*size))
            {
-             gmp_fprintf (stderr,
-                          "Different results from ecc->mul and ecc->mul_g.\n"
-                          " bits = %u\n"
-                          " n = %Nx\n",
-                          ecc->p.bit_size, n, size);
-             gmp_fprintf (stderr, "p = %Nx,\n    %Nx\n",
-                          p, size, p + size, size);
-             gmp_fprintf (stderr, "q = %Nx,\n    %Nx\n",
-                          q, size, q + size, size);
+             fprintf (stderr,
+                      "Different results from ecc->mul and ecc->mul_g.\n"
+                      " bits = %u\n",
+                      ecc->p.bit_size);
+             fprintf (stderr, " n = ");
+             mpn_out_str (stderr, 16, n, size);
+             
+             fprintf (stderr, "\np = ");
+             mpn_out_str (stderr, 16, p, size);
+             fprintf (stderr, ",\n    ");
+             mpn_out_str (stderr, 16, p + size, size);
+
+             fprintf (stderr, "\nq = ");
+             mpn_out_str (stderr, 16, q, size);
+             fprintf (stderr, ",\n    ");
+             mpn_out_str (stderr, 16, q + size, size);
+             fprintf (stderr, "\n");
              abort ();
            }
        }
@@ -100,4 +100,3 @@ test_main (void)
   mpz_clear (r); 
   gmp_randclear (rands);
 }
-#endif /* ! NETTLE_USE_MINI_GMP */