diff options
| author | Your Name <you@example.com> | 2026-05-19 14:34:12 +0530 |
|---|---|---|
| committer | Your Name <you@example.com> | 2026-05-19 14:34:12 +0530 |
| commit | 55917e09b186c44afc53fc0dd2d3635b34febcd8 (patch) | |
| tree | 62e07abecb50ec2c392f7b82df0eb6d50806fa4c /tests/unit/Makefile | |
| parent | e366ceb336550a72c76efea4c98a2a08cca27bce (diff) | |
fix: resolve merge conflicts + test build fixes
- config.h: remove duplicate nostr_sync fields
- Makefile: add mint_health stub for test_session_payment_method
- test_tollgate_client_mining: inline market_t stub to avoid dependency cascade
- CMakeLists: add negentropy_adapter.c + esp_littlefs + negentropy REQUIRES
Diffstat (limited to 'tests/unit/Makefile')
| -rw-r--r-- | tests/unit/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unit/Makefile b/tests/unit/Makefile index edff73c..b0b6922 100644 --- a/tests/unit/Makefile +++ b/tests/unit/Makefile | |||
| @@ -97,7 +97,7 @@ test_stratum_proxy: test_stratum_proxy.c $(REPO_ROOT)/main/stratum_proxy.c $(REP | |||
| 97 | $(CC) $(CFLAGS) $< $(REPO_ROOT)/main/stratum_proxy.c $(REPO_ROOT)/main/mining_payment.c -o $@ $(LDFLAGS) | 97 | $(CC) $(CFLAGS) $< $(REPO_ROOT)/main/stratum_proxy.c $(REPO_ROOT)/main/mining_payment.c -o $@ $(LDFLAGS) |
| 98 | 98 | ||
| 99 | test_session_payment_method: test_session_payment_method.c $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c | 99 | test_session_payment_method: test_session_payment_method.c $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c |
| 100 | $(CC) $(CFLAGS) $< $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c -o $@ $(LDFLAGS) | 100 | $(CC) $(CFLAGS) -include stubs/mint_health.h $< $(REPO_ROOT)/main/session.c $(REPO_ROOT)/main/cashu.c -o $@ $(LDFLAGS) |
| 101 | 101 | ||
| 102 | test_tollgate_client_mining: test_tollgate_client_mining.c | 102 | test_tollgate_client_mining: test_tollgate_client_mining.c |
| 103 | $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) | 103 | $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) |