Add the ability to specify a target_os for gclient solutions

tests/gclient_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Unit tests for gclient.py.
 
 See gclient_smoketest.py for integration tests.
 """
 
@@ skipping 257 matching lines @@
     parser = gclient.Parser()
     options, _ = parser.parse_args([])
     options.force = True
     client = gclient.GClient.LoadCurrentConfig(options)
     work_queue = gclient_utils.ExecutionQueue(options.jobs, None)
     for s in client.dependencies:
       work_queue.enqueue(s)
     work_queue.flush({}, None, [], options=options)
     self.assertEqual(client.GetHooks(options), [x['action'] for x in hooks])
 
+  def testTargetOS(self):
+    """Verifies that specifying a target_os pulls in all relevant dependencies.
+
+    The target_os variable allows specifying the name of an additional OS which
+    should be considered when selecting dependencies from a DEPS' deps_os. The
+    value will be appended to the _enforced_os tuple.
+    """
+
+    write(
+        '.gclient',
+        'solutions = [\n'
+        '  { "name": "foo",\n'
+        '    "url": "svn://example.com/foo",\n'
+        '  }]\n'
+        'target_os = ["baz"]')
+    write(
+        os.path.join('foo', 'DEPS'),
+        'deps = {\n'
+        '  "foo/dir1": "/dir1",'
+        '}\n'
+        'deps_os = {\n'
+        '  "unix": { "foo/dir2": "/dir2", },\n'
+        '  "baz": { "foo/dir3": "/dir3", },\n'
+        '}')
+
+    parser = gclient.Parser()
+    options, args = parser.parse_args(['--jobs', '1'])
+    options.deps_os = "unix"
+
+    obj = gclient.GClient.LoadCurrentConfig(options)
+    obj.RunOnDeps('None', args)
+
+    self.assertEqual(4, len(self._get_processed()))

[M-A Ruel, 2012/04/27 16:11:53]

you could also
self.assertEquals(['baz', 'unix'], sorted(obj.enforced_os))

+    
 
 if __name__ == '__main__':
   sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
   sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout, include_zero=True)
   sys.stderr = gclient_utils.MakeFileAutoFlush(sys.stderr)
   sys.stderr = gclient_utils.MakeFileAnnotated(sys.stderr, include_zero=True)
   logging.basicConfig(
       level=[logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(sys.argv.count('-v'), 3)],
       format='%(relativeCreated)4d %(levelname)5s %(module)13s('
               '%(lineno)d) %(message)s')
   unittest.main()