diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-17 12:12:55 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-08-17 12:23:45 +0200 |
| commit | 740cff5808c3d733baabcca8ca24bd81dabcd25e (patch) | |
| tree | 618727f1afd0a8c270d97ce43110878ea9b51b72 /qa/pull-tester | |
| parent | 29496fc9e09586fcf7fb060c381cf2a518d0e7ed (diff) | |
| parent | fad8cf63e5f6a2e26b44dbf2bbdd7df901c4e6f4 (diff) | |
| download | bitcoin-740cff5808c3d733baabcca8ca24bd81dabcd25e.tar.xz | |
Merge #8482: [qa] Use single cache dir for chains
fad8cf6 [qa] Use single cache dir for chains (MarcoFalke)
fa2d68f [qa] Adjust timeouts for micro-optimization of run time (MarcoFalke)
fae596f [qa] Sort scripts by time for pull_tester and don't overwrite setup_chain (MarcoFalke)
Diffstat (limited to 'qa/pull-tester')
| -rwxr-xr-x | qa/pull-tester/rpc-tests.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index f65a3eefc3..a0951f31a0 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -112,6 +112,8 @@ testScripts = [ 'receivedby.py', 'mempool_resurrect_test.py', 'txn_doublespend.py --mineblock', + 'p2p-segwit.py', + 'segwit.py', 'txn_clone.py', 'getchaintips.py', 'rawtransactions.py', @@ -133,13 +135,12 @@ testScripts = [ 'disablewallet.py', 'sendheaders.py', 'keypool.py', + 'p2p-mempool.py', 'prioritise_transaction.py', 'invalidblockrequest.py', 'invalidtxrequest.py', 'abandonconflict.py', 'p2p-versionbits-warning.py', - 'p2p-segwit.py', - 'segwit.py', 'importprunedfunds.py', 'signmessages.py', 'p2p-compactblocks.py', @@ -194,6 +195,7 @@ def runtests(): coverage = RPCCoverage() print("Initializing coverage directory at %s\n" % coverage.dir) flags = ["--srcdir=%s/src" % BUILDDIR] + passon_args + flags.append("--cachedir=%s/qa/cache" % BUILDDIR) if coverage: flags.append(coverage.flag) |