Merge #18952: test: avoid os-dependant path
8a22fd0114
avoided os-dependant path (Ferdinando M. Ametrano) Pull request description: The current code fails on windows because of the forward slashes; using os.path.join solves the problem and it is in general more robust ACKs for top commit: MarcoFalke: ACK8a22fd0114
Tree-SHA512: 813f27aea33f97c8afac52e716a55fc5d7fb69621023aba99d40df7e1d145e0ec8d1eee49ddd403b219bf0e0e168e0e987b05c78eaef611f744d99bf2fc8bc91
This commit is contained in:
commit
f8123d483c
1 changed files with 12 additions and 2 deletions
|
@ -185,8 +185,18 @@ class BitcoinTestFramework(metaclass=BitcoinTestMetaClass):
|
||||||
config = configparser.ConfigParser()
|
config = configparser.ConfigParser()
|
||||||
config.read_file(open(self.options.configfile))
|
config.read_file(open(self.options.configfile))
|
||||||
self.config = config
|
self.config = config
|
||||||
self.options.bitcoind = os.getenv("BITCOIND", default=config["environment"]["BUILDDIR"] + '/src/bitcoind' + config["environment"]["EXEEXT"])
|
fname_bitcoind = os.path.join(
|
||||||
self.options.bitcoincli = os.getenv("BITCOINCLI", default=config["environment"]["BUILDDIR"] + '/src/bitcoin-cli' + config["environment"]["EXEEXT"])
|
config["environment"]["BUILDDIR"],
|
||||||
|
"src",
|
||||||
|
"bitcoind" + config["environment"]["EXEEXT"]
|
||||||
|
)
|
||||||
|
fname_bitcoincli = os.path.join(
|
||||||
|
config["environment"]["BUILDDIR"],
|
||||||
|
"src",
|
||||||
|
"bitcoin-cli" + config["environment"]["EXEEXT"]
|
||||||
|
)
|
||||||
|
self.options.bitcoind = os.getenv("BITCOIND", default=fname_bitcoind)
|
||||||
|
self.options.bitcoincli = os.getenv("BITCOINCLI", default=fname_bitcoincli)
|
||||||
|
|
||||||
self.options.previous_releases_path = os.getenv("PREVIOUS_RELEASES_DIR") or os.getcwd() + "/releases"
|
self.options.previous_releases_path = os.getenv("PREVIOUS_RELEASES_DIR") or os.getcwd() + "/releases"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue