aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2016-05-09 16:59:54 +0200
committerMarcoFalke <[email protected]>2016-05-09 17:00:21 +0200
commit3e90fe6534206412ea22beaa445cf20d28fbe718 (patch)
tree8288d51895aeaeef8f39d25948ff2a01a5554f83
parentMerge #8030: test: Revert fatal-ness of missing python-zmq (diff)
parentAutofind rpc tests --srcdir (diff)
downloaddiscoin-3e90fe6534206412ea22beaa445cf20d28fbe718.tar.xz
discoin-3e90fe6534206412ea22beaa445cf20d28fbe718.zip
Merge #8018: Autofind rpc tests --srcdir
5ea4508 Autofind rpc tests --srcdir (Jonas Schnelli)
-rwxr-xr-xqa/rpc-tests/test_framework/test_framework.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/qa/rpc-tests/test_framework/test_framework.py b/qa/rpc-tests/test_framework/test_framework.py
index ed12e1efb..0b6d1b6ab 100755
--- a/qa/rpc-tests/test_framework/test_framework.py
+++ b/qa/rpc-tests/test_framework/test_framework.py
@@ -102,7 +102,7 @@ class BitcoinTestFramework(object):
help="Leave bitcoinds and test.* datadir on exit or error")
parser.add_option("--noshutdown", dest="noshutdown", default=False, action="store_true",
help="Don't stop bitcoinds after the test execution")
- parser.add_option("--srcdir", dest="srcdir", default="../../src",
+ 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("--tmpdir", dest="tmpdir", default=tempfile.mkdtemp(prefix="test"),
help="Root directory for datadirs")