//tools/binary_size: Add Disassemble() to console.py. Tweak metadata.

tools/binary_size/integration_test.py

 #!/usr/bin/env python
 # Copyright 2017 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.
 
 import copy
 import difflib
 import itertools
 import logging
 import os
 import unittest
 import subprocess
 import sys
 import tempfile
 
 import describe
+import file_format
 import map2size
 import models
+import paths
 
 
 _SCRIPT_DIR = os.path.dirname(__file__)
 _TEST_DATA_DIR = os.path.join(_SCRIPT_DIR, 'testdata')
 _TEST_MAP_PATH = os.path.join(_TEST_DATA_DIR, 'test.map')
 
 update_goldens = False
 
 
 def _AssertGolden(expected_lines, actual_lines):
@@ skipping 22 matching lines @@
 
 def _RunApp(name, *args):
   argv = [os.path.join(_SCRIPT_DIR, name), '--no-pypy']
   argv.extend(args)
   return subprocess.check_output(argv).splitlines()
 
 
 class IntegrationTest(unittest.TestCase):
   size_info = None
 
-  def _GetParsedMap(self):
+  def _CloneSizeInfo(self):
     if not IntegrationTest.size_info:
-      IntegrationTest.size_info = map2size.Analyze(
-          _TEST_MAP_PATH, output_directory=_TEST_DATA_DIR)
+      lazy_paths = paths.LazyPaths(output_directory=_TEST_DATA_DIR)
+      IntegrationTest.size_info = map2size.Analyze(_TEST_MAP_PATH, lazy_paths)
     return copy.deepcopy(IntegrationTest.size_info)
 
   @_CompareWithGolden
   def test_Map2Size(self):
     with tempfile.NamedTemporaryFile(suffix='.size') as temp_file:
       _RunApp('map2size.py', '--output-directory', _TEST_DATA_DIR,
-              _TEST_MAP_PATH, temp_file.name)
+              '--map-file', _TEST_MAP_PATH, '', temp_file.name)
       size_info = map2size.Analyze(temp_file.name)
     sym_strs = (repr(sym) for sym in size_info.symbols)
     stats = describe.DescribeSizeInfoCoverage(size_info)
     return itertools.chain(stats, sym_strs)
 
   @_CompareWithGolden
   def test_ConsoleNullDiff(self):
-    return _RunApp('console.py', '--output-directory', _TEST_DATA_DIR,
-                   '--query', 'Diff(size_info1, size_info2)',
-                   _TEST_MAP_PATH, _TEST_MAP_PATH)
+    with tempfile.NamedTemporaryFile(suffix='.size') as temp_file:
+      file_format.SaveSizeInfo(self._CloneSizeInfo(), temp_file.name)
+      return _RunApp('console.py', '--query', 'Diff(size_info1, size_info2)',
+                     temp_file.name, temp_file.name)
 
   @_CompareWithGolden
   def test_ActualDiff(self):
-    map1 = self._GetParsedMap()
-    map2 = self._GetParsedMap()
+    map1 = self._CloneSizeInfo()
+    map2 = self._CloneSizeInfo()
     map1.symbols -= map1.symbols[0]
     map2.symbols -= map2.symbols[-1]
     map1.symbols[1].size -= 10
     diff = models.Diff(map1, map2)
     return describe.GenerateLines(diff, verbose=True)
 
   @_CompareWithGolden
   def test_SymbolGroupMethods(self):
-    all_syms = self._GetParsedMap().symbols
+    all_syms = self._CloneSizeInfo().symbols
     global_syms = all_syms.WhereNameMatches('GLOBAL')
     # Tests Filter(), Inverted(), and __sub__().
     non_global_syms = global_syms.Inverted()
     self.assertEqual(non_global_syms, (all_syms - global_syms))
     # Tests Sorted() and __add__().
     self.assertEqual(all_syms.Sorted(),
                      (global_syms + non_global_syms).Sorted())
     # Tests GroupByNamespace() and __len__().
     return itertools.chain(
         ['GroupByNamespace()'],
@@ skipping 13 matching lines @@
   if len(argv) > 1 and argv[1] == '--update':
     argv.pop(0)
     global update_goldens
     update_goldens = True
 
   unittest.main(argv=argv, verbosity=2)
 
 
 if __name__ == '__main__':
   main()