handle RunCommand->run chromite updates
Also error_code_ok->check arguments.
BUG=chromium:1006587
TEST=`./run_tests` passes
Change-Id: I0d585059ae61c71453578793b2459234d5829ae9
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/firmware/+/1921691
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Mike Frysinger <vapier@chromium.org>
diff --git a/pack_firmware.py b/pack_firmware.py
index 831fd55..bd7aaa0 100755
--- a/pack_firmware.py
+++ b/pack_firmware.py
@@ -232,8 +232,8 @@
# Remove any file that might be in the way (if not testing).
if not self._args.testing and os.path.exists(fname):
os.remove(fname)
- cros_build_lib.RunCommand(['futility', 'dump_fmap', '-x', image_file],
- quiet=True, cwd=self._tmpdir, error_code_ok=True)
+ cros_build_lib.run(['futility', 'dump_fmap', '-x', image_file],
+ quiet=True, cwd=self._tmpdir, check=False)
if os.path.exists(fname):
return osutils.ReadFile(fname, mode='rb').replace(
b'\x00', b'').strip().decode('utf-8')
@@ -298,7 +298,7 @@
key: Section name.
value: Section() named tuple containing offset and size.
"""
- result = cros_build_lib.RunCommand(
+ result = cros_build_lib.run(
['futility', 'dump_fmap', '-p', fname],
quiet=True, cwd=self._tmpdir, encoding='utf-8')
sections = {}
@@ -379,7 +379,7 @@
fmap_area_name: Name of the FMAP area which contains the EC binary.
ecrw_fname: Filename to put EC binary into (relative or absolute path).
"""
- cros_build_lib.RunCommand(
+ cros_build_lib.run(
['futility', 'dump_fmap', '-x', fname, fmap_area_name],
quiet=True, cwd=self._tmpdir)
ec_main_a = os.path.join(self._tmpdir, fmap_area_name)
@@ -401,7 +401,7 @@
cbfs_name: Name of file in CBFS which contains the EC binary.
ecrw_fname: Filename to put EC binary into (relative or absolute path).
"""
- cros_build_lib.RunCommand(
+ cros_build_lib.run(
['cbfstool', fname, 'extract', '-n', cbfs_name, '-f', ecrw_fname, '-r',
'FW_MAIN_A'], quiet=True, cwd=self._tmpdir)
@@ -755,7 +755,7 @@
shell-ball, and display all version information.
"""
self._CopyFile(self._sfx_file, self._args.output, mode=CHMOD_ALL_EXEC)
- cros_build_lib.RunCommand(
+ cros_build_lib.run(
['sh', self._args.output, '--repack', self._basedir],
quiet=self._args.quiet, mute_output=not self._args.quiet)
if not self._args.quiet:
diff --git a/pack_firmware_functest.py b/pack_firmware_functest.py
index 10cd829..77303ee 100755
--- a/pack_firmware_functest.py
+++ b/pack_firmware_functest.py
@@ -138,9 +138,9 @@
if mode == 'output':
cmd += ['--model', model, '--output_dir', self.outdir]
cmd += ['--verbose', '--debug']
- result = cros_build_lib.RunCommand(cmd, capture_output=True,
- extra_env={'PATH': new_path},
- print_cmd=False, encoding='utf-8')
+ result = cros_build_lib.run(cmd, capture_output=True,
+ extra_env={'PATH': new_path},
+ print_cmd=False, encoding='utf-8')
# The stderr may contain debug messages, info, and status (>>).
# Anything else (for instance, 'ERROR:') should be error.
@@ -171,8 +171,8 @@
os.environ['SYSROOT'] = 'test'
os.environ['FILESDIR'] = 'test'
self.packer.Start(argv)
- cros_build_lib.RunCommand([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--unpack', self.unpackdir],
+ quiet=True, mute_output=True)
files = []
for dirpath, _, fnames in os.walk(self.unpackdir):
for fname in fnames:
@@ -356,8 +356,8 @@
outfile, files, _ = self._RunPackFirmware(extra_args)
cmd = [SHELL, outfile, '-V']
- result = cros_build_lib.RunCommand(cmd, capture_output=True,
- print_cmd=False, encoding='utf-8')
+ result = cros_build_lib.run(cmd, capture_output=True,
+ print_cmd=False, encoding='utf-8')
check_version_lines = result.output.splitlines()
version_lines = osutils.ReadFile(
@@ -399,8 +399,8 @@
# Extract the file into a directory, then overwrite various files with new
# images with a different IDs.
- cros_build_lib.RunCommand([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--unpack', self.unpackdir],
+ quiet=True, mute_output=True)
ro_id = 'Google_Veyron_Mickey.6588.197.0'
rw_id = 'Google_Veyron_Mickey.6588.197.1'
ec_id = 'GoogleEC_Veyron_Mickey.6588.197.0'
@@ -411,8 +411,8 @@
self._MakeImage('pd.bin', pd_id)
# Repack the file and make sure that the versions update.
- cros_build_lib.RunCommand([outfile, '--repack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--repack', self.unpackdir],
+ quiet=True, mute_output=True)
versions = pack_firmware_utils.ReadVersions(outfile)
self.assertEqual(ro_id, versions['TARGET_RO_FWID'])
self.assertEqual(rw_id, versions['TARGET_FWID'])
@@ -475,12 +475,11 @@
try:
expect_dir = os.path.join(self.tempdir, 'expect')
osutils.SafeMakedirs(expect_dir)
- cros_build_lib.RunCommand(['dump_fmap', '-x', expect_fname], quiet=True,
- cwd=expect_dir)
+ cros_build_lib.run(['dump_fmap', '-x', expect_fname], quiet=True,
+ cwd=expect_dir)
actual_dir = os.path.join(self.tempdir, 'actual')
osutils.SafeMakedirs(actual_dir)
- cros_build_lib.RunCommand(['dump_fmap', '-x', fname], quiet=True,
- cwd=actual_dir)
+ cros_build_lib.run(['dump_fmap', '-x', fname], quiet=True, cwd=actual_dir)
differ = []
for expect_fname in glob.glob('%s/*' % expect_dir):
expect = osutils.ReadFile(expect_fname, mode='rb')
@@ -489,9 +488,9 @@
if sig_id and basename in ['VBLOCK_A', 'VBLOCK_B']:
expect = self._GetVblock(sig_id, basename[-1])
elif expect_root_sum and basename == 'GBB':
- result = cros_build_lib.RunCommand(
+ result = cros_build_lib.run(
['futility', 'show', fname], quiet=True, mute_output=True,
- error_code_ok=True, encoding='utf-8')
+ check=False, encoding='utf-8')
# Relevant output is:
# Root Key:
# Vboot API: 1.0
@@ -575,7 +574,7 @@
shutil.copy(rootkey, keydir)
self._CopyVblock(keydir, sig_id, 'A')
self._CopyVblock(keydir, sig_id, 'B')
- result = cros_build_lib.RunCommand(
+ result = cros_build_lib.run(
['futility', 'show', rootkey], quiet=True, mute_output=True,
encoding='utf-8')
@@ -614,13 +613,13 @@
Returns:
List of sums for each key in key_ids
"""
- cros_build_lib.RunCommand([outfile, '--unpack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--unpack', self.unpackdir],
+ quiet=True, mute_output=True)
keydir = os.path.join(self.unpackdir, 'keyset')
osutils.SafeMakedirs(keydir)
key_sums = [self._AddKeys(keydir, x) for x in key_ids]
- cros_build_lib.RunCommand([outfile, '--repack', self.unpackdir],
- quiet=True, mute_output=True)
+ cros_build_lib.run([outfile, '--repack', self.unpackdir],
+ quiet=True, mute_output=True)
return key_sums
def testSignedFirmwareOutput(self):
