Attempt to fix expansion of the goma directory in MB on windows.

It looks like backslashes are not being escaped correctly, and
so we're getting an invalid path to the goma toolchain when
trying to build.

R=scottmg@chromium.org
NOTRY=true
BUG=

Review URL: https://codereview.chromium.org/1356743002

Cr-Commit-Position: refs/heads/master@{#349529}

2 files changed, 9 insertions, 11 deletions

diff --git a/tools/mb/mb.py b/tools/mb/mb.py
index 10cff53..3588b0a 100755
--- a/tools/mb/mb.py
+++ b/tools/mb/mb.py
@@ -16,9 +16,7 @@ import ast
 import errno
 import json
 import os
-import pipes
 import pprint
-import shlex
 import shutil
 import sys
 import subprocess
@@ -592,7 +590,7 @@ class MetaBuildWrapper(object):
         '-G',
         'output_dir=' + output_dir,
     ]
-    for d in shlex.split(gyp_defines):
+    for d in gyp_defines.split(' '):
       cmd += ['-D', d]
     return cmd
 
@@ -727,7 +725,7 @@ class MetaBuildWrapper(object):
   def PrintCmd(self, cmd):
     if cmd[0] == self.executable:
       cmd = ['python'] + cmd[1:]
-    self.Print(*[pipes.quote(c) for c in cmd])
+    self.Print(*cmd)
 
   def PrintJSON(self, obj):
     self.Print(json.dumps(obj, indent=2, sort_keys=True))
diff --git a/tools/mb/mb_unittest.py b/tools/mb/mb_unittest.py
index fad5e76..298330f 100755
--- a/tools/mb/mb_unittest.py
+++ b/tools/mb/mb_unittest.py
@@ -126,7 +126,7 @@ TEST_CONFIG = """\
     'gn': {'type': 'gn'},
     'goma': {
       'gn_args': 'use_goma=true goma_dir="$(goma_dir)"',
-      'gyp_defines': 'goma=1 gomadir="$(goma_dir)"',
+      'gyp_defines': 'goma=1 gomadir=$(goma_dir)',
     },
     'rel': {
       'gn_args': 'is_debug=false',
@@ -285,9 +285,9 @@ class UnitTest(unittest.TestCase):
 
   def test_gn_lookup_goma_dir_expansion(self):
     self.check(['lookup', '-c', 'gn_rel_bot', '-g', '/foo'], ret=0,
-               out=("/fake_src/buildtools/linux64/gn gen '<path>' "
-                    "'--args=is_debug=false use_goma=true "
-                    "goma_dir=\"/foo\"'\n" ))
+               out=("/fake_src/buildtools/linux64/gn gen <path> "
+                    "--args=is_debug=false use_goma=true "
+                    "goma_dir=\"/foo\"\n" ))
 
   def test_gyp_analyze(self):
     mbw = self.check(['analyze', '-c', 'gyp_rel_bot', '//out/Release',
@@ -311,8 +311,8 @@ class UnitTest(unittest.TestCase):
     mbw.sep = '\\'
     self.check(['gen', '-c', 'gyp_rel_bot', '-g', 'c:\\goma', '//out/Release'],
                mbw=mbw, ret=0,
-               out=("python 'build\\gyp_chromium' -G output_dir=out "
-                    "-D goma=1 -D 'gomadir=c:\\goma'\n"))
+               out=("python build\\gyp_chromium -G output_dir=out "
+                    "-D goma=1 -D gomadir=c:\\goma\n"))
 
   def test_gyp_gen_fails(self):
     mbw = self.fake_mbw()
@@ -321,7 +321,7 @@ class UnitTest(unittest.TestCase):
 
   def test_gyp_lookup_goma_dir_expansion(self):
     self.check(['lookup', '-c', 'gyp_rel_bot', '-g', '/foo'], ret=0,
-               out=("python build/gyp_chromium -G 'output_dir=<path>' "
+               out=("python build/gyp_chromium -G output_dir=<path> "
                     "-D goma=1 -D gomadir=/foo\n"))
 
   def test_help(self):