test: don't override BITCOIND and BITCOINCLI if they're set #7209

Merged
merged 1 commit into from Dec 17, 2015

Conversation

Projects
None yet
4 participants
@laanwj
Member

laanwj commented Dec 14, 2015

In rpc-tests.py, don't override BITCOIND and BITCOINCLI if they're already set. Makes it possible to run the tests with either another tree or the GUI.

test: don't override BITCOIND and BITCOINCLI if they're set
In rpc-tests.py, don't override BITCOIND and BITCOINCLI if they're
already set. Makes it possible to run the tests with either another tree
or the GUI.

@laanwj laanwj added the Tests label Dec 14, 2015

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli

jonasschnelli Dec 14, 2015

Member

utACK.

Member

jonasschnelli commented Dec 14, 2015

utACK.

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Dec 14, 2015

Member

Tested ACK 83cdcbd

Member

MarcoFalke commented Dec 14, 2015

Tested ACK 83cdcbd

@fanquake

This comment has been minimized.

Show comment
Hide comment
Member

fanquake commented Dec 17, 2015

utACK 83cdcbd

@laanwj laanwj merged commit 83cdcbd into bitcoin:master Dec 17, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Dec 17, 2015

Merge pull request #7209
83cdcbd test: don't override BITCOIND and BITCOINCLI if they're set (Wladimir J. van der Laan)

laanwj added a commit that referenced this pull request Dec 17, 2015

test: don't override BITCOIND and BITCOINCLI if they're set
In rpc-tests.py, don't override BITCOIND and BITCOINCLI if they're
already set. Makes it possible to run the tests with either another tree
or the GUI.

Github-Pull: #7209
Rebased-From: 83cdcbd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment