DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix gtest ordering broken by #1949

Browse Source 
Part of #1539
This commit is contained in:
Jack Grigg
2017-01-16 20:16:29 +01:00
parent f3a4dae63a
commit 5ae347827f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Makefile.gtest.include
View File

@@ -10,7 +10,14 @@ zcash_gtest_SOURCES = \
gtest/test_checktransaction.cpp \ gtest/test_checktransaction.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
endif
zcash_gtest_SOURCES += \
gtest/test_jsonspirit.cpp \ gtest/test_jsonspirit.cpp \
gtest/test_tautology.cpp \ gtest/test_tautology.cpp \
gtest/test_equihash.cpp \ gtest/test_equihash.cpp \
@@ -30,8 +37,7 @@ zcash_gtest_SOURCES = \
gtest/test_checkblock.cpp gtest/test_checkblock.cpp
if ENABLE_WALLET if ENABLE_WALLET
zcash_gtest_SOURCES += \ zcash_gtest_SOURCES += \
wallet/gtest/test_wallet.cpp \ wallet/gtest/test_wallet.cpp
wallet/gtest/test_wallet_zkeys.cpp
endif endif
zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC