diff options
Diffstat (limited to 'tools/binman')
-rw-r--r-- | tools/binman/bintool.py | 2 | ||||
-rw-r--r-- | tools/binman/elf.py | 2 | ||||
-rw-r--r-- | tools/binman/elf_test.py | 2 | ||||
-rw-r--r-- | tools/binman/ftest.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tools/binman/bintool.py b/tools/binman/bintool.py index 068d766c507..7a0c8163924 100644 --- a/tools/binman/bintool.py +++ b/tools/binman/bintool.py @@ -268,7 +268,7 @@ class Bintool: all_args = (name,) + args env = tools.get_env_with_path() tout.Detail(f"bintool: {' '.join(all_args)}") - result = command.RunPipe( + result = command.run_pipe( [all_args], capture=True, capture_stderr=True, env=env, raise_on_error=False, binary=binary) diff --git a/tools/binman/elf.py b/tools/binman/elf.py index d22a0d4bf5c..47e0a3f51cc 100644 --- a/tools/binman/elf.py +++ b/tools/binman/elf.py @@ -285,7 +285,7 @@ SECTIONS cc, args = tools.get_target_compile_tool('cc') args += ['-static', '-nostdlib', '-Wl,--build-id=none', '-m32', '-T', lds_file, '-o', elf_fname, s_file] - stdout = command.Output(cc, *args) + stdout = command.output(cc, *args) shutil.rmtree(outdir) def DecodeElf(data, location): diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index b531062f4a9..0f749ee2541 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -195,7 +195,7 @@ class TestElf(unittest.TestCase): elf.MakeElf(elf_fname, expected_text, expected_data) objcopy, args = tools.get_target_compile_tool('objcopy') args += ['-O', 'binary', elf_fname, bin_fname] - stdout = command.Output(objcopy, *args) + stdout = command.output(objcopy, *args) with open(bin_fname, 'rb') as fd: data = fd.read() self.assertEqual(expected_text + expected_data, data) diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 21adf433fe3..f85581ccd42 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -282,7 +282,7 @@ class TestFunctional(unittest.TestCase): Arguments to pass, as a list of strings kwargs: Arguments to pass to Command.RunPipe() """ - result = command.RunPipe([[self._binman_pathname] + list(args)], + result = command.run_pipe([[self._binman_pathname] + list(args)], capture=True, capture_stderr=True, raise_on_error=False) if result.return_code and kwargs.get('raise_on_error', True): raise Exception("Error running '%s': %s" % (' '.join(args), |