From aefbdc4a9d78d0b92dabb960fadd13801202afe2 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 2 Sep 2010 16:45:50 +1000
Subject: 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()
---
 buildtools/wafsamba/samba_utils.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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:])
-- 
cgit