Update UniValue includes in Zcash-specific code

[VerusCoin.git] / src / Makefile.gtest.include

diff --git a/src/Makefile.gtest.include b/src/Makefile.gtest.include
index 589293c9c340888f3a0088cc9a494332e4dccea1..8db5aea4119fb8e08ef997d332abe6b3decfc9f4 100644 (file)
--- a/src/Makefile.gtest.include
+++ b/src/Makefile.gtest.include
@@ -1,5 +1,5 @@
 TESTS += zcash-gtest
-bin_PROGRAMS += zcash-gtest
+noinst_PROGRAMS += zcash-gtest
 
 # tool for generating our public parameters.
 # test_checktransaction.cpp MUST be before
@@ -10,9 +10,14 @@ zcash_gtest_SOURCES = \
        gtest/test_checktransaction.cpp \
        gtest/json_test_vectors.cpp \
        gtest/json_test_vectors.h \
-       gtest/test_foundersreward.cpp \
-       gtest/test_wallet_zkeys.cpp \
-       gtest/test_jsonspirit.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_tautology.cpp \
        gtest/test_equihash.cpp \
        gtest/test_joinsplit.cpp \
@@ -20,6 +25,7 @@ zcash_gtest_SOURCES = \
        gtest/test_noteencryption.cpp \
        gtest/test_merkletree.cpp \
        gtest/test_metrics.cpp \
+       gtest/test_miner.cpp \
        gtest/test_pow.cpp \
        gtest/test_random.cpp \
        gtest/test_rpc.cpp \
@@ -28,13 +34,19 @@ zcash_gtest_SOURCES = \
        gtest/test_txid.cpp \
        gtest/test_libzcash_utils.cpp \
        gtest/test_proofs.cpp \
-       gtest/test_checkblock.cpp \
+       gtest/test_checkblock.cpp
+if ENABLE_WALLET
+zcash_gtest_SOURCES += \
        wallet/gtest/test_wallet.cpp
+endif
 
-zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC
+zcash_gtest_CPPFLAGS = -DMULTICORE -fopenmp -DBINARY_OUTPUT -DCURVE_ALT_BN128 -DSTATIC $(BITCOIN_INCLUDES)
 
-zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+zcash_gtest_LDADD = -lgtest -lgmock $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
   $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
+if ENABLE_ZMQ
+zcash_gtest_LDADD += $(LIBBITCOIN_ZMQ) $(ZMQ_LIBS)
+endif
 if ENABLE_WALLET
 zcash_gtest_LDADD += $(LIBBITCOIN_WALLET)
 endif