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/rpc-tests/test_framework/test_framework.py | |
| 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/rpc-tests/test_framework/test_framework.py')
| -rwxr-xr-x | qa/rpc-tests/test_framework/test_framework.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py index 0dfece6b27..a1383729fa 100755 --- a/qa/rpc-tests/test_framework/test_framework.py +++ b/qa/rpc-tests/test_framework/test_framework.py @@ -48,7 +48,7 @@ class BitcoinTestFramework(object): if self.setup_clean_chain: initialize_chain_clean(self.options.tmpdir, self.num_nodes) else: - initialize_chain(self.options.tmpdir, self.num_nodes) + initialize_chain(self.options.tmpdir, self.num_nodes, self.options.cachedir) def stop_node(self, num_node): stop_node(self.nodes[num_node], num_node) @@ -112,6 +112,8 @@ class BitcoinTestFramework(object): help="Don't stop bitcoinds after the test execution") parser.add_option("--srcdir", dest="srcdir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../../src"), help="Source directory containing bitcoind/bitcoin-cli (default: %default)") + parser.add_option("--cachedir", dest="cachedir", default=os.path.normpath(os.path.dirname(os.path.realpath(__file__))+"/../../cache"), + help="Directory for caching pregenerated datadirs") parser.add_option("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"), help="Root directory for datadirs") parser.add_option("--tracerpc", dest="trace_rpc", default=False, action="store_true", |