diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-12 11:30:17 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2018-02-12 11:31:18 +0100 |
| commit | b4d85490f09eab84497f7b352a6ca2b3f48de815 (patch) | |
| tree | 47f654eea6bec32d3ccc07565a6538c7edd1bab0 /test/util | |
| parent | 108af52ef75a466be71d04bb973b794eca17e212 (diff) | |
| parent | faefd2923a00e82be794f090b4bd861c5c58c95a (diff) | |
| download | bitcoin-b4d85490f09eab84497f7b352a6ca2b3f48de815.tar.xz | |
Merge #11858: qa: Prepare tests for Windows
faefd29 qa: Prepare functional tests for Windows (MarcoFalke)
Pull request description:
* Pass `sys.executable` when calling a python script via the subprocess
module
* Don't remove the log file while it is still open and written to
* Properly use os.pathsep and os.path.sep when modifying the PATH
environment variable
* util-tests: Use os.path.join for Windows compatibility
Ref: #8227
Tree-SHA512: c507a536af104b3bde4366b6634099db826532bd3e7c35d694b5883c550920643b3eab79c76703ca67e1044ed09979e855088f7324321c8d52112514e334d614
Diffstat (limited to 'test/util')
| -rwxr-xr-x | test/util/bitcoin-util-test.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/util/bitcoin-util-test.py b/test/util/bitcoin-util-test.py index 64e826ad0b..30bd13d0dc 100755 --- a/test/util/bitcoin-util-test.py +++ b/test/util/bitcoin-util-test.py @@ -44,7 +44,7 @@ def main(): # Add the format/level to the logger logging.basicConfig(format=formatter, level=level) - bctester(os.path.join(env_conf["SRCDIR"], "test/util/data"), "bitcoin-util-test.json", env_conf) + bctester(os.path.join(env_conf["SRCDIR"], "test", "util", "data"), "bitcoin-util-test.json", env_conf) def bctester(testDir, input_basename, buildenv): """ Loads and parses the input file, runs all tests and reports results""" |