Remove code for old style of 'analyze' in 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
@@ skipping 186 matching lines @@
     # exists but wasn't populated by mb; this should also result in a clobber.
     del mbw.files['/fake_src/out/Debug/mb_type']
     self.check(['gen', '-c', 'gyp_debug', '//out/Debug'], mbw=mbw, ret=0)
     self.assertEqual(mbw.rmdirs,
                      ['/fake_src/out/Debug', '/fake_src/out/Debug'])
     self.assertEqual(mbw.files['/fake_src/out/Debug/mb_type'], 'gyp')
 
   def test_gn_analyze(self):
     files = {'/tmp/in.json': """{\
                "files": ["foo/foo_unittest.cc"],
-               "targets": ["foo_unittests", "bar_unittests"]
-             }"""}
-
-    mbw = self.fake_mbw(files)
-    mbw.Call = lambda cmd, env=None, buffer_output=True: (
-        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',
-      'targets': ['foo_unittests'],
-      'build_targets': ['foo_unittests']
-    })
-
-  def test_gn_analyze_new_logic(self):
-    files = {'/tmp/in.json': """{\
-               "files": ["foo/foo_unittest.cc"],
                "test_targets": ["foo_unittests", "bar_unittests"],
                "additional_compile_targets": []
              }"""}
 
     mbw = self.fake_mbw(files)
     mbw.Call = lambda cmd, env=None, buffer_output=True: (
         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',
       'compile_targets': ['foo_unittests'],
       'test_targets': ['foo_unittests']
     })
 
   def test_gn_analyze_all(self):
     files = {'/tmp/in.json': """{\
                "files": ["foo/foo_unittest.cc"],
-               "targets": ["all", "bar_unittests"]
-             }"""}
-    mbw = self.fake_mbw(files)
-    mbw.Call = lambda cmd, env=None, buffer_output=True: (
-        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_all_new_logic(self):
-    files = {'/tmp/in.json': """{\
-               "files": ["foo/foo_unittest.cc"],
                "test_targets": ["bar_unittests"],
                "additional_compile_targets": ["all"]
              }"""}
     mbw = self.fake_mbw(files)
     mbw.Call = lambda cmd, env=None, buffer_output=True: (
         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)',
       'compile_targets': ['all', 'bar_unittests'],
       'test_targets': ['bar_unittests'],
     })
 
   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.cmds = [
-        (0, '', ''),
-        (1, 'The input matches no targets, configs, or files\n', ''),
-        (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_gn_analyze_missing_file_new_logic(self):
-    files = {'/tmp/in.json': """{\
-               "files": ["foo/foo_unittest.cc"],
                "test_targets": ["bar_unittests"],
                "additional_compile_targets": []
              }"""}
     mbw = self.fake_mbw(files)
     mbw.cmds = [
         (0, '', ''),
         (1, 'The input matches no targets, configs, or files\n', ''),
         (1, 'The input matches no targets, configs, or files\n', ''),
     ]
 
@@ skipping 143 matching lines @@
     finally:
       sys.stdout = orig_stdout
 
 
   def test_validate(self):
     self.check(['validate'], ret=0)
 
 
 if __name__ == '__main__':
   unittest.main()