Skip to content

Commit 90dd9e6

Browse files
committed
Merge #9946: Fix build errors if spaces in path or parent directory
b1f584d fix build if spaces in src dir path (Matthew Zipkin) Tree-SHA512: 5834690c1f63b85ed04bb8ed411a94da04738534364d58bd9ee333ccff7129b2bbb710f31598c40123199e023da02c1745514294af3efdbb2c2e4c1320aded35
2 parents 5d7eb39 + b1f584d commit 90dd9e6

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ BITCOIN_CORE_H = \
167167

168168
obj/build.h: FORCE
169169
@$(MKDIR_P) $(builddir)/obj
170-
@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
171-
$(abs_top_srcdir)
170+
@$(top_srcdir)/share/genbuild.sh "$(abs_top_builddir)/src/obj/build.h" \
171+
"$(abs_top_srcdir)"
172172
libbitcoin_util_a-clientversion.$(OBJEXT): obj/build.h
173173

174174
# server: shared between bitcoind and bitcoin-qt

test/functional/test_runner.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@
9090
ZMQ_SCRIPTS = [
9191
# ZMQ test can only be run if bitcoin was built with zmq-enabled.
9292
# call test_runner.py with -nozmq to explicitly exclude these tests.
93-
"zmq_test.py"]
93+
'zmq_test.py']
9494

9595
EXTENDED_SCRIPTS = [
9696
# These tests are not run by the travis build process.
@@ -206,9 +206,9 @@ def main():
206206
sys.exit(0)
207207

208208
if args.help:
209-
# Print help for test_runner.py, then print help of the first script and exit.
209+
# Print help for test_runner.py, then print help of the first script (with args removed) and exit.
210210
parser.print_help()
211-
subprocess.check_call((config["environment"]["SRCDIR"] + '/test/functional/' + test_list[0]).split() + ['-h'])
211+
subprocess.check_call([(config["environment"]["SRCDIR"] + '/test/functional/' + test_list[0].split()[0])] + ['-h'])
212212
sys.exit(0)
213213

214214
run_tests(test_list, config["environment"]["SRCDIR"], config["environment"]["BUILDDIR"], config["environment"]["EXEEXT"], args.jobs, args.coverage, passon_args)
@@ -299,9 +299,10 @@ def get_next(self):
299299
port_seed = ["--portseed={}".format(len(self.test_list) + self.portseed_offset)]
300300
log_stdout = tempfile.SpooledTemporaryFile(max_size=2**16)
301301
log_stderr = tempfile.SpooledTemporaryFile(max_size=2**16)
302+
test_argv = t.split()
302303
self.jobs.append((t,
303304
time.time(),
304-
subprocess.Popen((self.tests_dir + t).split() + self.flags + port_seed,
305+
subprocess.Popen([self.tests_dir + test_argv[0]] + test_argv[1:] + self.flags + port_seed,
305306
universal_newlines=True,
306307
stdout=log_stdout,
307308
stderr=log_stderr),

0 commit comments

Comments
 (0)