pytest: don't assume paths of valgrind and bitcoind.

In particular, my bitcoind is in /usr/local/bin

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-01-24 14:37:56 +10:30
parent 7cc5e2fc7a
commit 1575181ef5
2 changed files with 2 additions and 2 deletions

View File

@@ -73,7 +73,7 @@ class NodeFactory(object):
self.nodes.append(node) self.nodes.append(node)
if VALGRIND: if VALGRIND:
node.daemon.cmd_line = [ node.daemon.cmd_line = [
'/usr/bin/valgrind', 'valgrind',
'-q', '-q',
'--error-exitcode=7', '--error-exitcode=7',
'--log-file={}/valgrind-errors'.format(node.daemon.lightning_dir) '--log-file={}/valgrind-errors'.format(node.daemon.lightning_dir)

View File

@@ -133,7 +133,7 @@ class BitcoinD(TailableProc):
os.makedirs(regtestdir) os.makedirs(regtestdir)
self.cmd_line = [ self.cmd_line = [
'/usr/bin/bitcoind', 'bitcoind',
'-datadir={}'.format(bitcoin_dir), '-datadir={}'.format(bitcoin_dir),
'-printtoconsole', '-printtoconsole',
'-server', '-server',