From 9f238b7d1839c8b3e6c61c7cb491184fc59bfffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 23 Apr 2020 18:19:09 +0200
Subject: [PATCH] In tests, delete ASSERTs with functions pointer comparisons.
---
ChangeLog | 7 +++++++
testsuite/ecc-add-test.c | 9 ---------
testsuite/ecc-dup-test.c | 5 -----
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cbe00c35..e900fb02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2020-04-23 Niels Möller <nisse@lysator.liu.se>
+
+ * testsuite/ecc-add-test.c (test_main): Delete ASSERTs with
+ functions pointer comparisons. They provide little value, and fail
+ when linking with hogweed.dll on windows.
+ * testsuite/ecc-dup-test.c (test_main): Likewise.
+
2020-04-22 Niels Möller <nisse@lysator.liu.se>
* testsuite/Makefile.in: Use pattern rules for test executables,
diff --git a/testsuite/ecc-add-test.c b/testsuite/ecc-add-test.c
index 3e14b30e..d3b0bd92 100644
--- a/testsuite/ecc-add-test.c
+++ b/testsuite/ecc-add-test.c
@@ -23,10 +23,6 @@ test_main (void)
{
mp_limb_t *z = xalloc_limbs (ecc_size_j (ecc));
- ASSERT ((ecc->p.bit_size == 255 && ecc->add_hh == ecc_add_th)
- || (ecc->p.bit_size == 448 && ecc->add_hh == ecc_add_eh));
- ASSERT ((ecc->p.bit_size == 255 && ecc->add_hhh == ecc_add_thh)
- || (ecc->p.bit_size == 448 && ecc->add_hhh == ecc_add_ehh));
ASSERT (ecc->add_hh_itch <= ecc->add_hhh_itch);
/* Zero point has x = 0, y = 1, z = 1 */
@@ -53,11 +49,6 @@ test_main (void)
free (z);
}
- else
- {
- ASSERT (ecc->add_hhh == ecc_add_jjj);
- ASSERT (ecc->dup == ecc_dup_jj);
- }
ecc->dup (ecc, g2, g, scratch);
test_ecc_mul_h (i, 2, g2);
diff --git a/testsuite/ecc-dup-test.c b/testsuite/ecc-dup-test.c
index 500826ac..c7fefdb7 100644
--- a/testsuite/ecc-dup-test.c
+++ b/testsuite/ecc-dup-test.c
@@ -18,9 +18,6 @@ test_main (void)
{
mp_limb_t *z = xalloc_limbs (ecc_size_j (ecc));
- ASSERT ((ecc->p.bit_size == 255 && ecc->dup == ecc_dup_th)
- || (ecc->p.bit_size == 448 && ecc->dup == ecc_dup_eh));
-
/* Zero point has x = 0, y = 1, z = 1 */
mpn_zero (z, 3*ecc->p.size);
z[ecc->p.size] = z[2*ecc->p.size] = 1;
@@ -30,8 +27,6 @@ test_main (void)
free (z);
}
- else
- ASSERT (ecc->dup == ecc_dup_jj);
ecc->dup (ecc, p, g, scratch);
test_ecc_mul_h (i, 2, p);
--
GitLab