From 83aa4c6068d8850933f5a0fb4de0b64ed085ef74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Fri, 3 Oct 2014 16:43:47 +0200
Subject: [PATCH] Enable ecc-mul-a-test, also with mini-gmp.

---
 ChangeLog                  |  3 ++-
 testsuite/ecc-mul-a-test.c | 35 +++++++++++++++++------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 88046b7b..f481ee40 100644
--- 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 e1958a1e..b206b848 100644
--- 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 */
-- 
GitLab