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 192 matching lines @@
         items.append(self.processed.get_nowait())
     except Queue.Empty:
       pass
     return items
 
   def testAutofix(self):
     # Invalid urls causes pain when specifying requirements. Make sure it's
     # auto-fixed.
     d = gclient.Dependency(
         None, 'name', 'proto://host/path/@revision', None, None, None,
-        None, '', True)
+        None, '', None, True)
     self.assertEquals('proto://host/path@revision', d.url)
 
   def testStr(self):
     parser = gclient.Parser()
     options, _ = parser.parse_args([])
     obj = gclient.GClient('foo', options)
     obj.add_dependencies_and_close(
         [
           gclient.Dependency(
-            obj, 'foo', 'url', None, None, None, None, 'DEPS', True),
+            obj, 'foo', 'url', None, None, None, None, 'DEPS', None, True),
           gclient.Dependency(
-            obj, 'bar', 'url', None, None, None, None, 'DEPS', True),
+            obj, 'bar', 'url', None, None, None, None, 'DEPS', None, True),
         ],
         [])
     obj.dependencies[0].add_dependencies_and_close(
         [
           gclient.Dependency(
             obj.dependencies[0], 'foo/dir1', 'url', None, None, None, None,
-            'DEPS', True),
+            'DEPS', None, True),
           gclient.Dependency(
             obj.dependencies[0], 'foo/dir2',
             gclient.GClientKeywords.FromImpl('bar'), None, None, None, None,
-            'DEPS', True),
+            'DEPS', None, True),
           gclient.Dependency(
             obj.dependencies[0], 'foo/dir3',
             gclient.GClientKeywords.FileImpl('url'), None, None, None, None,
-            'DEPS', True),
+            'DEPS', None, True),
         ],
         [])
     # Make sure __str__() works fine.
     # pylint: disable=W0212
     obj.dependencies[0]._file_list.append('foo')
     str_obj = str(obj)
     self.assertEquals(471, len(str_obj), '%d\n%s' % (len(str_obj), str_obj))
 
   def testHooks(self):
     topdir = self.root_dir
@@ skipping 18 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 = [
+  { "name": "foo",
+    "url": "svn://example.com/foo",
+    "target_os": "baz"
+  }
+]""")
+    write(
+        os.path.join('foo', 'DEPS'),
+        """
+deps = {
+  "foo/dir1": "/dir1"
+}
+deps_os = {
+  "unix": { "foo/dir2": "/dir2" },
+  "baz": { "foo/dir3": "/dir3" }
+}""")
+
+    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()))
+    
 
 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()