Pārlūkot izejas kodu

binman: Rename the main module

Python does not like the module name being the same as the module
directory. To allow buildman modules to be used from other tools, rename
it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Simon Glass 4 gadi atpakaļ
vecāks
revīzija
c07ab6effb
4 mainītis faili ar 7 papildinājumiem un 7 dzēšanām
  1. 1 1
      tools/binman/binman
  2. 3 3
      tools/binman/ftest.py
  3. 2 2
      tools/binman/main.py
  4. 1 1
      tools/patman/test_util.py

+ 1 - 1
tools/binman/binman

@@ -1 +1 @@
-binman.py
+main.py

+ 3 - 3
tools/binman/ftest.py

@@ -15,7 +15,7 @@ import sys
 import tempfile
 import tempfile
 import unittest
 import unittest
 
 
-import binman
+import main
 import cbfs_util
 import cbfs_util
 import cmdline
 import cmdline
 import command
 import command
@@ -1428,14 +1428,14 @@ class TestFunctional(unittest.TestCase):
     def testEntryDocs(self):
     def testEntryDocs(self):
         """Test for creation of entry documentation"""
         """Test for creation of entry documentation"""
         with test_util.capture_sys_output() as (stdout, stderr):
         with test_util.capture_sys_output() as (stdout, stderr):
-            control.WriteEntryDocs(binman.GetEntryModules())
+            control.WriteEntryDocs(main.GetEntryModules())
         self.assertTrue(len(stdout.getvalue()) > 0)
         self.assertTrue(len(stdout.getvalue()) > 0)
 
 
     def testEntryDocsMissing(self):
     def testEntryDocsMissing(self):
         """Test handling of missing entry documentation"""
         """Test handling of missing entry documentation"""
         with self.assertRaises(ValueError) as e:
         with self.assertRaises(ValueError) as e:
             with test_util.capture_sys_output() as (stdout, stderr):
             with test_util.capture_sys_output() as (stdout, stderr):
-                control.WriteEntryDocs(binman.GetEntryModules(), 'u_boot')
+                control.WriteEntryDocs(main.GetEntryModules(), 'u_boot')
         self.assertIn('Documentation is missing for modules: u_boot',
         self.assertIn('Documentation is missing for modules: u_boot',
                       str(e.exception))
                       str(e.exception))
 
 

+ 2 - 2
tools/binman/binman.py → tools/binman/main.py

@@ -155,8 +155,8 @@ def RunTestCoverage():
     glob_list = GetEntryModules(False)
     glob_list = GetEntryModules(False)
     all_set = set([os.path.splitext(os.path.basename(item))[0]
     all_set = set([os.path.splitext(os.path.basename(item))[0]
                    for item in glob_list if '_testing' not in item])
                    for item in glob_list if '_testing' not in item])
-    test_util.RunTestCoverage('tools/binman/binman.py', None,
-            ['*test*', '*binman.py', 'tools/patman/*', 'tools/dtoc/*'],
+    test_util.RunTestCoverage('tools/binman/binman', None,
+            ['*test*', '*main.py', 'tools/patman/*', 'tools/dtoc/*'],
             args.build_dir, all_set)
             args.build_dir, all_set)
 
 
 def RunBinman(args):
 def RunBinman(args):

+ 1 - 1
tools/patman/test_util.py

@@ -41,7 +41,7 @@ def RunTestCoverage(prog, filter_fname, exclude_list, build_dir, required=None):
         glob_list = []
         glob_list = []
     glob_list += exclude_list
     glob_list += exclude_list
     glob_list += ['*libfdt.py', '*site-packages*', '*dist-packages*']
     glob_list += ['*libfdt.py', '*site-packages*', '*dist-packages*']
-    test_cmd = 'test' if 'binman.py' in prog else '-t'
+    test_cmd = 'test' if 'binman' in prog else '-t'
     cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools %s-coverage run '
     cmd = ('PYTHONPATH=$PYTHONPATH:%s/sandbox_spl/tools %s-coverage run '
            '--omit "%s" %s %s -P1' % (build_dir, PYTHON, ','.join(glob_list),
            '--omit "%s" %s %s -P1' % (build_dir, PYTHON, ','.join(glob_list),
                                       prog, test_cmd))
                                       prog, test_cmd))