Merge pull request #5903 from superbaud/simplify-gtest-makefile

Closing #1539 simplifies gtest Makefile
This commit is contained in:
Kris Nuttycombe 2022-04-21 16:09:00 -06:00 committed by GitHub
commit e9f0d94999
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions

View File

@ -16,15 +16,7 @@ zcash_gtest_SOURCES = \
gtest/test_consensus.cpp \ gtest/test_consensus.cpp \
gtest/json_test_vectors.cpp \ gtest/json_test_vectors.cpp \
gtest/json_test_vectors.h \ gtest/json_test_vectors.h \
gtest/test_foundersreward.cpp gtest/test_foundersreward.cpp \
# These tests are order-dependent, because they
# depend on global state (see #1539)
if ENABLE_WALLET
zcash_gtest_SOURCES += \
wallet/gtest/test_wallet_zkeys.cpp \
wallet/gtest/test_orchard_zkeys.cpp
endif
zcash_gtest_SOURCES += \
test/data/merkle_roots_orchard.h \ test/data/merkle_roots_orchard.h \
gtest/data/tx-orchard-duplicate-nullifiers.h \ gtest/data/tx-orchard-duplicate-nullifiers.h \
gtest/test_tautology.cpp \ gtest/test_tautology.cpp \
@ -62,6 +54,8 @@ zcash_gtest_SOURCES += \
gtest/test_zip32.cpp gtest/test_zip32.cpp
if ENABLE_WALLET if ENABLE_WALLET
zcash_gtest_SOURCES += \ zcash_gtest_SOURCES += \
wallet/gtest/test_wallet_zkeys.cpp \
wallet/gtest/test_orchard_zkeys.cpp \
wallet/gtest/test_note_selection.cpp \ wallet/gtest/test_note_selection.cpp \
wallet/gtest/test_orchard_wallet.cpp \ wallet/gtest/test_orchard_wallet.cpp \
wallet/gtest/test_paymentdisclosure.cpp \ wallet/gtest/test_paymentdisclosure.cpp \