aboutsummaryrefslogtreecommitdiff
path: root/src/memusage.h
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2018-04-24 10:02:39 -0400
committerMarcoFalke <falke.marco@gmail.com>2018-04-24 10:02:56 -0400
commit9ea62a3dc4bd50a139e6d3c72e4f94d909ef10f3 (patch)
treedf85fc09e7c6d93fdbf45c91020eea263c2f0be7 /src/memusage.h
parent845838c4451ecd1f7e988e7538a4d82f80b73670 (diff)
parent41c29f6d1df0f78cfeb0b688a0a1750c8b2e5c03 (diff)
downloadbitcoin-9ea62a3dc4bd50a139e6d3c72e4f94d909ef10f3.tar.xz
Merge #13049: [0.16] qa: Backports
41c29f6d1d qa: Fix python TypeError in script.py (MarcoFalke) 7460945e0b [qa] Delete cookie file before starting node (Suhas Daftuar) 0a76ed232a qa: Cache only chain and wallet for regtest datadir (MarcoFalke) 6c26df06ad [qa] Ensure bitcoind processes are cleaned up when tests end (Suhas Daftuar) df38b130d9 [tests] Test starting bitcoind with -h and -version (John Newbery) 4bdb0ce517 [tests] Fix intermittent rpc_net.py failure. (John Newbery) 0e98f96e42 test: Use wait_until in tests where time was used for polling (Ben Woosley) 1286f3e49a test: Use wait_until to ensure ping goes out (Ben Woosley) cfebd400ef [test] Round target fee to 8 decimals in assert_fee_amount (Karl-Johan Alm) Pull request description: Similar to #12967 this contains all relevant bugfixes and improvements to the functional test suite. I didn't include fixes to make the tests run on Windows, since that is still an ongoing effort and doesn't seem worth to backport. As all of these are clean cherry-picks, I suggest reviewers redo the cherry-picks to get the same branch and then run the extended test suite. Tree-SHA512: 70e1bc28d5572f93796f1ac4d97d77e8146869c15dcc1e3b65a730fa2641283050f769cefd9791d800c758e0a92f11fd55ed0797ccec87b897c7e701d0187f34
Diffstat (limited to 'src/memusage.h')
0 files changed, 0 insertions, 0 deletions