Reland "Remove the 'gyp_config' concept from MB."

tools/mb/mb_unittest.py

 #!/usr/bin/python
 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Tests for mb.py."""
 
 import json
 import StringIO
+import os
 import sys
 import unittest
 
 import mb
 
 
 class FakeMBW(mb.MetaBuildWrapper):
   def __init__(self):
     super(FakeMBW, self).__init__()
+
+    # Override vars for test portability.
+    self.chromium_src_dir = '/fake_src'
+    self.default_config = '/fake_src/tools/mb/mb_config.pyl'
+    self.executable = 'python'
+    self.platform = 'linux2'
+    self.sep = '/'
+
     self.files = {}
     self.calls = []
     self.cmds = []
     self.cross_compile = None
     self.out = ''
     self.err = ''
-    self.platform = 'linux2'
-    self.chromium_src_dir = '/fake_src'
-    self.default_config = '/fake_src/tools/mb/mb_config.pyl'
     self.rmdirs = []
 
   def ExpandUser(self, path):
     return '$HOME/%s' % path
 
   def Exists(self, path):
     return self.files.get(path) is not None
 
   def MaybeMakeDirectory(self, path):
     self.files[path] = True
 
+  def PathJoin(self, *comps):
+    return self.sep.join(comps)
+
   def ReadFile(self, path):
     return self.files[path]
 
   def WriteFile(self, path, contents, force_verbose=False):
     self.files[path] = contents
 
   def Call(self, cmd, env=None):
     if env:
       self.cross_compile = env.get('GYP_CROSSCOMPILE')
     self.calls.append(cmd)
@@ skipping 65 matching lines @@
       'gyp_defaults': 'doom_melon=0',
     },
     'gyp': {'type': 'gyp'},
     'gn': {'type': 'gn'},
     'goma': {
       'gn_args': 'use_goma=true goma_dir="$(goma_dir)"',
       'gyp_defines': 'goma=1 gomadir="$(goma_dir)"',
     },
     'rel': {
       'gn_args': 'is_debug=false',
-      'gyp_config': 'Release',
     },
     'debug': {
       'gn_args': 'is_debug=true',
-      'gyp_config': 'Debug',
     },
   },
   'private_configs': ['private'],
   'unsupported_configs': ['unsupported'],
 }
 """
 
 
 class UnitTest(unittest.TestCase):
   def fake_mbw(self, files=None):
@@ skipping 20 matching lines @@
   def test_clobber(self):
     files = {
       '/fake_src/out/Debug': None,
       '/fake_src/out/Debug/mb_type': None,
     }
     mbw = self.fake_mbw(files)
 
     # The first time we run this, the build dir doesn't exist, so no clobber.
     self.check(['gen', '-c', 'gn_debug', '//out/Debug'], mbw=mbw, ret=0)
     self.assertEqual(mbw.rmdirs, [])
-    self.assertTrue(mbw.files['/fake_src/out/Debug/mb_type'], 'gn')
+    self.assertEqual(mbw.files['/fake_src/out/Debug/mb_type'], 'gn')
 
     # The second time we run this, the build dir exists and matches, so no
     # clobber.
     self.check(['gen', '-c', 'gn_debug', '//out/Debug'], mbw=mbw, ret=0)
     self.assertEqual(mbw.rmdirs, [])
     self.assertEqual(mbw.files['/fake_src/out/Debug/mb_type'], 'gn')
 
     # Now we switch build types; this should result in a clobber.
     self.check(['gen', '-c', 'gyp_debug', '//out/Debug'], mbw=mbw, ret=0)
     self.assertEqual(mbw.rmdirs, ['/fake_src/out/Debug'])
@@ skipping 107 matching lines @@
                      '/tmp/in.json', '/tmp/out.json'],
                      ret=0)
     self.assertIn('analyzer', mbw.calls[0])
 
   def test_gyp_crosscompile(self):
     mbw = self.fake_mbw()
     self.check(['gen', '-c', 'private', '//out/Release'], mbw=mbw)
     self.assertTrue(mbw.cross_compile)
 
   def test_gyp_gen(self):
-    self.check(['gen', '-c', 'gyp_rel_bot', '//out/Release'], ret=0)
+    self.check(['gen', '-c', 'gyp_rel_bot', '-g', '/goma', '//out/Release'],
+               ret=0,
+               out=("python build/gyp_chromium -G output_dir=out "
+                    "-D goma=1 -D gomadir=/goma\n"))
+
+    # simulate win32
+    mbw = self.fake_mbw()
+    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"))
 
   def test_gyp_gen_fails(self):
     mbw = self.fake_mbw()
     mbw.Call = lambda cmd, env=None: (1, '', '')
     self.check(['gen', '-c', 'gyp_rel_bot', '//out/Release'], mbw=mbw, ret=1)
 
   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>' "
-                    "-G config=Release -D goma=1 -D gomadir=/foo\n"))
+                    "-D goma=1 -D gomadir=/foo\n"))
 
   def test_help(self):
     orig_stdout = sys.stdout
     try:
       sys.stdout = StringIO.StringIO()
       self.assertRaises(SystemExit, self.check, ['-h'])
       self.assertRaises(SystemExit, self.check, ['help'])
       self.assertRaises(SystemExit, self.check, ['help', 'gen'])
     finally:
       sys.stdout = orig_stdout
 
 
   def test_validate(self):
     self.check(['validate'], ret=0)
 
 
 if __name__ == '__main__':
   unittest.main()