//tools/binary_size: Consolidate most tools into "supersize" command

tools/binary_size/libsupersize/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 archive
 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
 
@@ skipping 16 matching lines @@
       with open(golden_path, 'w') as file_obj:
         describe.WriteLines(actual_lines, file_obj.write)
       logging.info('Wrote %s', golden_path)
     else:
       with open(golden_path) as file_obj:
         _AssertGolden(file_obj, actual_lines)
   return inner
 
 
 def _RunApp(name, *args):
-  argv = [os.path.join(_SCRIPT_DIR, name), '--no-pypy']
+  argv = [os.path.join(_SCRIPT_DIR, 'main.py'), name, '--no-pypy']
   argv.extend(args)
   return subprocess.check_output(argv).splitlines()
 
 
 class IntegrationTest(unittest.TestCase):
   size_info = None
 
   def _CloneSizeInfo(self):
     if not IntegrationTest.size_info:
       lazy_paths = paths.LazyPaths(output_directory=_TEST_DATA_DIR)
       IntegrationTest.size_info = (
-          map2size.CreateSizeInfo(_TEST_MAP_PATH, lazy_paths))
+          archive.CreateSizeInfo(_TEST_MAP_PATH, lazy_paths))
     return copy.deepcopy(IntegrationTest.size_info)
 
   @_CompareWithGolden
-  def test_Map2Size(self):
+  def test_Archive(self):
     with tempfile.NamedTemporaryFile(suffix='.size') as temp_file:
-      _RunApp('map2size.py', '--output-directory', _TEST_DATA_DIR,
-              '--map-file', _TEST_MAP_PATH, '--elf-file', '',
-              '--output-file', temp_file.name)
-      size_info = map2size.LoadAndPostProcessSizeInfo(temp_file.name)
+      _RunApp('archive', temp_file.name, '--output-directory', _TEST_DATA_DIR,
+              '--map-file', _TEST_MAP_PATH, '--elf-file', '')
+      size_info = archive.LoadAndPostProcessSizeInfo(temp_file.name)
     # Check that saving & loading is the same as directly parsing the .map.
     expected_size_info = self._CloneSizeInfo()
     self.assertEquals(expected_size_info.metadata, size_info.metadata)
     expected = '\n'.join(describe.GenerateLines(
         expected_size_info, verbose=True, recursive=True)),
     actual = '\n'.join(describe.GenerateLines(
         size_info, verbose=True, recursive=True)),
     self.assertEquals(expected, actual)
 
     sym_strs = (repr(sym) for sym in size_info.symbols)
     stats = describe.DescribeSizeInfoCoverage(size_info)
     return itertools.chain(stats, sym_strs)
 
-  def test_Map2Size_NoSourcePaths(self):
+  def test_Archive_NoSourcePaths(self):
     # Just tests that it doesn't crash.
     with tempfile.NamedTemporaryFile(suffix='.size') as temp_file:
-      _RunApp('map2size.py', '--no-source-paths',
-              '--map-file', _TEST_MAP_PATH, '--elf-file', '',
-              '--output-file', temp_file.name)
-      map2size.LoadAndPostProcessSizeInfo(temp_file.name)
+      _RunApp('archive', temp_file.name, '--no-source-paths',
+              '--map-file', _TEST_MAP_PATH, '--elf-file', '')
+      archive.LoadAndPostProcessSizeInfo(temp_file.name)
 
   @_CompareWithGolden
   def test_ConsoleNullDiff(self):
     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)',
+      return _RunApp('console', '--query', 'Diff(size_info1, size_info2)',
                      temp_file.name, temp_file.name)
 
   @_CompareWithGolden
   def test_ActualDiff(self):
     size_info1 = self._CloneSizeInfo()
     size_info2 = self._CloneSizeInfo()
     size_info1.metadata = {"foo": 1, "bar": [1,2,3], "baz": "yes"}
     size_info2.metadata = {"foo": 1, "bar": [1,3], "baz": "yes"}
     size_info1.symbols -= size_info1.symbols[:2]
     size_info2.symbols -= size_info2.symbols[-3:]
@@ skipping 34 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()