Re-roll GN to 326666 and fix GN-related bugs.

tools/mb/mb_unittest.py

 # 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 sys
 import unittest
 
@@ skipping 135 matching lines @@
     mbw = self.fake_mbw(files)
     mbw.Call = lambda cmd: (0, 'out/Default/foo_unittests\n', '')
 
     self.check(['analyze', '-c', 'gn_debug', '//out/Default',
                 '/tmp/in.json', '/tmp/out.json'], mbw=mbw, ret=0)
     out = json.loads(mbw.files['/tmp/out.json'])
     self.assertEqual(out, {
       'status': 'Found dependency (all)',
     })
 
+  def test_gn_analyze_missing_file(self):
+    files = {'/tmp/in.json': """{\
+               "files": ["foo/foo_unittest.cc"],
+               "targets": ["bar_unittests"]
+             }"""}
+    mbw = self.fake_mbw(files)
+    mbw.Call = lambda cmd: (
+        1, 'The input matches no targets, configs, or files\n', '')
+
+    self.check(['analyze', '-c', 'gn_debug', '//out/Default',
+                '/tmp/in.json', '/tmp/out.json'], mbw=mbw, ret=0)
+    out = json.loads(mbw.files['/tmp/out.json'])
+    self.assertEqual(out, {
+      'build_targets': [],
+      'targets': [],
+      'status': 'No dependency',
+    })
+
   def test_gyp_analyze(self):
     self.check(['analyze', '-c', 'gyp_rel_bot', '//out/Release',
                 '/tmp/in.json', '/tmp/out.json'],
                ret=0)
 
   def test_gen(self):
     self.check(['gen', '-c', 'gn_debug', '//out/Default'], ret=0)
     self.check(['gen', '-c', 'gyp_rel_bot', '//out/Release'], ret=0)
 
   def test_goma_dir_expansion(self):
@@ skipping 12 matching lines @@
 
   def test_lookup(self):
     self.check(['lookup', '-c', 'gn_debug'], ret=0)
 
   def test_validate(self):
     self.check(['validate'], ret=0)
 
 
 if __name__ == '__main__':
   unittest.main()