Skip to content

Commit 006ddc1

Browse files
committed
Merge bitcoin-core/secp256k1#1306: build: Make tests work with external default callbacks
1907f0f build: Make tests work with external default callbacks (Tim Ruffing) Pull request description: ACKs for top commit: sipa: ACK 1907f0f jonasnick: ACK 1907f0f Tree-SHA512: 198598f7bf5292bf5709187f9a40ddf9a0fba93e8b62afb49df2c05b4ef61c394cea43ee07615b51ceea97862228d8ad351fddef13c190cb2e6690943ed63128
2 parents fb3a806 + 1907f0f commit 006ddc1

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

src/tests.c

+5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010

1111
#include <time.h>
1212

13+
#ifdef USE_EXTERNAL_DEFAULT_CALLBACKS
14+
#pragma message("Ignoring USE_EXTERNAL_CALLBACKS in tests.")
15+
#undef USE_EXTERNAL_DEFAULT_CALLBACKS
16+
#endif
1317
#include "secp256k1.c"
18+
1419
#include "../include/secp256k1.h"
1520
#include "../include/secp256k1_preallocated.h"
1621
#include "testrand_impl.h"

src/tests_exhaustive.c

+5
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,12 @@
1313
#define EXHAUSTIVE_TEST_ORDER 13
1414
#endif
1515

16+
#ifdef USE_EXTERNAL_DEFAULT_CALLBACKS
17+
#pragma message("Ignoring USE_EXTERNAL_CALLBACKS in exhaustive_tests.")
18+
#undef USE_EXTERNAL_DEFAULT_CALLBACKS
19+
#endif
1620
#include "secp256k1.c"
21+
1722
#include "../include/secp256k1.h"
1823
#include "assumptions.h"
1924
#include "group.h"

0 commit comments

Comments
 (0)