10 Commits

Author SHA1 Message Date
miketout
9feb4b9e08 Major updates integration from all upstreams 2018-09-18 14:33:53 -07:00
Asher Dawes
155d2cb3e4 Removing unnecessary slashes
changing brewfile dependency of gcc@5 to gcc@6
2018-08-18 00:44:01 -07:00
Jack Grigg
7d65dcf4d9 depends: Pass correct compiler, linker, and flags into googletest 2018-08-17 16:47:03 +01:00
ca333
14b5fdf828 fix gtest/gmock
OSX related path-fix in makefile
2018-04-18 22:22:31 +02:00
jl777
995fee09af Test 2018-03-25 19:14:36 +03:00
jl777
9000990c30 Merge remote-tracking branch 'zcash/master' into rebase2
# Conflicts:
#	.travis.yml
#	Makefile.am
#	README.md
#	configure.ac
#	depends/Makefile
#	depends/builders/darwin.mk
#	depends/funcs.mk
#	depends/hosts/darwin.mk
#	depends/packages/googlemock.mk
#	depends/packages/googletest.mk
#	depends/packages/libsnark.mk
#	depends/packages/libsodium.mk
#	depends/packages/packages.mk
#	depends/packages/rust.mk
#	src/Makefile.am
#	src/Makefile.gtest.include
#	src/chainparams.cpp
#	src/chainparams.h
#	src/checkpoints.h
#	src/clientversion.h
#	src/coins.cpp
#	src/consensus/consensus.h
#	src/gtest/test_mempool.cpp
#	src/httprpc.cpp
#	src/init.cpp
#	src/komodo-tx.cpp
#	src/main.cpp
#	src/miner.cpp
#	src/policy/fees.cpp
#	src/policy/fees.h
#	src/rpcmining.cpp
#	src/rpcrawtransaction.cpp
#	src/rpcserver.cpp
#	src/test/policyestimator_tests.cpp
#	src/test/rpc_wallet_tests.cpp
#	src/test/transaction_tests.cpp
#	src/txdb.cpp
#	src/txmempool.cpp
#	src/wallet/asyncrpcoperation_sendmany.cpp
#	src/wallet/rpcwallet.cpp
#	src/wallet/wallet.cpp
#	src/wallet/wallet.h
#	src/zcash/CreateJoinSplit.cpp
#	zcutil/build.sh
2018-03-25 18:44:38 +03:00
Jack Grigg
9635679cba Replace "install -D" with "mkdir -p && install" 2017-11-29 17:26:47 +00:00
syd
24902602f2 Upgrade googletest to 1.8.0 2017-11-19 14:08:17 -05:00
ca333
9d36579649 uni3 2017-10-09 11:45:49 +02:00
Nathan Wilcox
0ee1d5d133 Add a depends description for googletest. 2016-04-18 11:13:05 -07:00