Merge branch '1.14-branding'

1 files changed, 121 insertions, 25 deletions

diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index 4652d8c45..1e3eaea88 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -1,5 +1,10 @@
+# Copyright (c) 2013-2016 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
 TESTS += test/test_dogecoin
 bin_PROGRAMS += test/test_dogecoin
+noinst_PROGRAMS += test/test_dogecoin_fuzzy
 TEST_SRCDIR = test
 TEST_BINARY=test/test_dogecoin$(EXEEXT)
 
@@ -8,21 +13,60 @@ EXTRA_DIST += \
 	test/bctest.py \
 	test/bitcoin-util-test.py \
 	test/data/bitcoin-util-test.json \
-	test/data/blanktx.hex \
+	test/data/blanktxv1.hex \
+	test/data/blanktxv1.json \
+	test/data/blanktxv2.hex \
+	test/data/blanktxv2.json \
 	test/data/tt-delin1-out.hex \
+	test/data/tt-delin1-out.json \
 	test/data/tt-delout1-out.hex \
+	test/data/tt-delout1-out.json \
 	test/data/tt-locktime317000-out.hex \
+	test/data/tt-locktime317000-out.json \
 	test/data/tx394b54bb.hex \
 	test/data/txcreate1.hex \
+	test/data/txcreate1.json \
 	test/data/txcreate2.hex \
-	test/data/txcreatesign.hex
+	test/data/txcreate2.json \
+	test/data/txcreatedata1.hex \
+	test/data/txcreatedata1.json \
+	test/data/txcreatedata2.hex \
+	test/data/txcreatedata2.json \
+	test/data/txcreatedata_seq0.hex \
+	test/data/txcreatedata_seq0.json \
+	test/data/txcreatedata_seq1.hex \
+	test/data/txcreatedata_seq1.json \
+	test/data/txcreatemultisig1.hex \
+	test/data/txcreatemultisig1.json \
+	test/data/txcreatemultisig2.hex \
+	test/data/txcreatemultisig2.json \
+	test/data/txcreatemultisig3.hex \
+	test/data/txcreatemultisig3.json \
+	test/data/txcreatemultisig4.hex \
+	test/data/txcreatemultisig4.json \
+	test/data/txcreateoutpubkey1.hex \
+	test/data/txcreateoutpubkey1.json \
+	test/data/txcreateoutpubkey2.hex \
+	test/data/txcreateoutpubkey2.json \
+	test/data/txcreateoutpubkey3.hex \
+	test/data/txcreateoutpubkey3.json \
+	test/data/txcreatescript1.hex \
+	test/data/txcreatescript1.json \
+	test/data/txcreatescript2.hex \
+	test/data/txcreatescript2.json \
+	test/data/txcreatescript3.hex \
+	test/data/txcreatescript3.json \
+	test/data/txcreatescript4.hex \
+	test/data/txcreatescript4.json \
+	test/data/txcreatesignv1.hex \
+	test/data/txcreatesignv1.json \
+	test/data/txcreatesignv2.hex
 
 JSON_TEST_FILES = \
-  test/data/script_valid.json \
+  test/data/script_tests.json \
   test/data/base58_keys_valid.json \
   test/data/base58_encode_decode.json \
   test/data/base58_keys_invalid.json \
-  test/data/script_invalid.json \
   test/data/tx_invalid.json \
   test/data/tx_valid.json \
   test/data/sighash.json
@@ -31,36 +75,47 @@ RAW_TEST_FILES = test/data/alertTests.raw
 
 GENERATED_TEST_FILES = $(JSON_TEST_FILES:.json=.json.h) $(RAW_TEST_FILES:.raw=.raw.h)
 
+# test_bitcoin binary #
 BITCOIN_TESTS =\
   test/arith_uint256_tests.cpp \
-  test/bignum.h \
+  test/scriptnum10.h \
+  test/addrman_tests.cpp \
   test/alert_tests.cpp \
+  test/amount_tests.cpp \
   test/allocator_tests.cpp \
   test/auxpow_tests.cpp \
   test/base32_tests.cpp \
   test/base58_tests.cpp \
   test/base64_tests.cpp \
   test/bip32_tests.cpp \
+  test/blockencodings_tests.cpp \
   test/bloom_tests.cpp \
-  test/checkblock_tests.cpp \
-  test/Checkpoints_tests.cpp \
+  test/bswap_tests.cpp \
+  test/checkqueue_tests.cpp \
   test/coins_tests.cpp \
   test/compress_tests.cpp \
   test/crypto_tests.cpp \
+  test/cuckoocache_tests.cpp \
   test/DoS_tests.cpp \
   test/dogecoin_tests.cpp \
   test/getarg_tests.cpp \
   test/hash_tests.cpp \
   test/key_tests.cpp \
+  test/limitedmap_tests.cpp \
+  test/dbwrapper_tests.cpp \
   test/main_tests.cpp \
   test/mempool_tests.cpp \
+  test/merkle_tests.cpp \
   test/miner_tests.cpp \
-  test/mruset_tests.cpp \
   test/multisig_tests.cpp \
+  test/net_tests.cpp \
   test/netbase_tests.cpp \
   test/pmt_tests.cpp \
   test/policyestimator_tests.cpp \
   test/pow_tests.cpp \
+  test/prevector_tests.cpp \
+  test/raii_event_tests.cpp \
+  test/reverselock_tests.cpp \
   test/rpc_tests.cpp \
   test/sanity_tests.cpp \
   test/scheduler_tests.cpp \
@@ -72,32 +127,64 @@ BITCOIN_TESTS =\
   test/sighash_tests.cpp \
   test/sigopcount_tests.cpp \
   test/skiplist_tests.cpp \
+  test/streams_tests.cpp \
   test/test_bitcoin.cpp \
   test/test_bitcoin.h \
+  test/test_random.h \
+  test/testutil.cpp \
+  test/testutil.h \
   test/timedata_tests.cpp \
   test/transaction_tests.cpp \
+  test/txvalidationcache_tests.cpp \
+  test/versionbits_tests.cpp \
   test/uint256_tests.cpp \
   test/univalue_tests.cpp \
   test/util_tests.cpp
 
 if ENABLE_WALLET
 BITCOIN_TESTS += \
-  test/accounting_tests.cpp \
+  wallet/test/wallet_test_fixture.cpp \
+  wallet/test/wallet_test_fixture.h \
+  wallet/test/accounting_tests.cpp \
   wallet/test/wallet_tests.cpp \
-  test/rpc_wallet_tests.cpp
+  wallet/test/crypto_tests.cpp
 endif
 
 test_test_dogecoin_SOURCES = $(BITCOIN_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
-test_test_dogecoin_CPPFLAGS = $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS)
-test_test_dogecoin_LDADD = $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_COMMON) $(LIBBITCOIN_UTIL) $(LIBBITCOIN_CRYPTO) $(LIBBITCOIN_UNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
-  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1)
+test_test_dogecoin_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) -I$(builddir)/test/ $(TESTDEFS) $(EVENT_CFLAGS)
+test_test_dogecoin_LDADD = $(LIBDOGECOIN_SERVER) $(LIBDOGECOIN_CLI) $(LIBDOGECOIN_COMMON) $(LIBDOGECOIN_UTIL) $(LIBDOGECOIN_CONSENSUS) $(LIBDOGECOIN_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) $(LIBMEMENV) \
+  $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS)
+test_test_dogecoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 if ENABLE_WALLET
-test_test_dogecoin_LDADD += $(LIBBITCOIN_WALLET)
+test_test_dogecoin_LDADD += $(LIBDOGECOIN_WALLET)
 endif
 
-test_test_dogecoin_LDADD += $(LIBBITCOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
+test_test_dogecoin_LDADD += $(LIBDOGECOIN_CONSENSUS) $(BDB_LIBS) $(SSL_LIBS) $(CRYPTO_LIBS) $(MINIUPNPC_LIBS)
 test_test_dogecoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
 
+if ENABLE_ZMQ
+test_test_dogecoin_LDADD += $(ZMQ_LIBS)
+endif
+#
+
+# test_bitcoin_fuzzy binary #
+test_test_dogecoin_fuzzy_SOURCES = test/test_bitcoin_fuzzy.cpp
+test_test_dogecoin_fuzzy_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES)
+test_test_dogecoin_fuzzy_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
+test_test_dogecoin_fuzzy_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
+
+test_test_dogecoin_fuzzy_LDADD = \
+  $(LIBUNIVALUE) \
+  $(LIBDOGECOIN_SERVER) \
+  $(LIBDOGECOIN_COMMON) \
+  $(LIBDOGECOIN_UTIL) \
+  $(LIBDOGECOIN_CONSENSUS) \
+  $(LIBDOGECOIN_CRYPTO) \
+  $(LIBSECP256K1)
+
+test_test_dogecoin_fuzzy_LDADD += $(BOOST_LIBS) $(CRYPTO_LIBS)
+#
+
 nodist_test_test_dogecoin_SOURCES = $(GENERATED_TEST_FILES)
 
 $(BITCOIN_TESTS): $(GENERATED_TEST_FILES)
@@ -106,31 +193,40 @@ CLEAN_BITCOIN_TEST = test/*.gcda test/*.gcno $(GENERATED_TEST_FILES)
 
 CLEANFILES += $(CLEAN_BITCOIN_TEST)
 
+# This file is problematic for out-of-tree builds if it exists.
+DISTCLEANFILES += test/buildenv.pyc
+
 dogecoin_test: $(TEST_BINARY)
 
 dogecoin_test_check: $(TEST_BINARY) FORCE
 	$(MAKE) check-TESTS TESTS=$^
 
 dogecoin_test_clean : FORCE
-	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+	rm -f $(CLEAN_BITCOIN_TEST) $(test_test_dogecoin_OBJECTS) $(TEST_BINARY)
 
 check-local:
 	@echo "Running test/bitcoin-util-test.py..."
-	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py
+	$(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(PYTHON) $(srcdir)/test/bitcoin-util-test.py
 	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+if EMBEDDED_UNIVALUE
+	$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check
+endif
 
 %.json.h: %.json
 	@$(MKDIR_P) $(@D)
-	@echo "namespace json_tests{" > $@
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};};" >> $@
+	@{ \
+	 echo "namespace json_tests{" && \
+	 echo "static unsigned const char $(*F)[] = {" && \
+	 $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
+	 echo "};};"; \
+	} > "[email protected]" && mv -f "[email protected]" "$@"
 	@echo "Generated $@"
 
 %.raw.h: %.raw
 	@$(MKDIR_P) $(@D)
-	@echo "namespace alert_tests{" > $@
-	@echo "static unsigned const char $(*F)[] = {" >> $@
-	@$(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' >> $@
-	@echo "};};" >> $@
+	@{ \
+	 echo "static unsigned const char $(*F)[] = {" && \
+   $(HEXDUMP) -v -e '8/1 "0x%02x, "' -e '"\n"' $< | $(SED) -e 's/0x  ,//g' && \
+	 echo "};"; \
+	} > "[email protected]" && mv -f "[email protected]" "$@"
 	@echo "Generated $@"