summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-09-02 16:45:50 +1000
committerAndrew Tridgell <tridge@samba.org>2010-09-04 12:29:10 +1000
commitaefbdc4a9d78d0b92dabb960fadd13801202afe2 (patch)
tree71a39c30ffd3741c2f176b71e5d8624ee10bb21d
parentb58bfb351025816b18389ac2377c429b8a777dde (diff)
downloadsamba-aefbdc4a9d78d0b92dabb960fadd13801202afe2.tar.gz
samba-aefbdc4a9d78d0b92dabb960fadd13801202afe2.tar.bz2
samba-aefbdc4a9d78d0b92dabb960fadd13801202afe2.zip
waf: fixed make test with TESTS="test1 test2"
when multiple tests are specified, make escapes the space in MAKEFLAGS with a backslash, so we need to use shlex.split()
-rw-r--r--buildtools/wafsamba/samba_utils.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index 304264b363..d858c5c9e5 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -451,7 +451,9 @@ def CHECK_MAKEFLAGS(bld):
return
makeflags = os.environ.get('MAKEFLAGS')
jobs_set = False
- for opt in makeflags.split():
+ # we need to use shlex.split to cope with the escaping of spaces
+ # in makeflags
+ for opt in shlex.split(makeflags):
# options can come either as -x or as x
if opt[0:2] == 'V=':
Options.options.verbose = Logs.verbose = int(opt[2:])