test: Drop the cmd() function

Instead of this, use the existing run_and_log() function, enhanced to
support a command string as well as a list of arguments.

Suggested-by: Stephen Warren <swarren@nvidia.com>

Signed-off-by: Simon Glass <sjg@chromium.org>

2 files changed, 17 insertions, 24 deletions

diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py
index 8d1071000c..7935fae957 100644
--- a/test/py/tests/test_vboot.py
+++ b/test/py/tests/test_vboot.py
@@ -50,8 +50,8 @@ def test_vboot(u_boot_console):
             dts: Device tree file to compile.
         """
         dtb = dts.replace('.dts', '.dtb')
-        util.cmd(cons, 'dtc %s %s%s -O dtb '
-                       '-o %s%s' % (dtc_args, datadir, dts, tmpdir, dtb))
+        util.run_and_log(cons, 'dtc %s %s%s -O dtb '
+                         '-o %s%s' % (dtc_args, datadir, dts, tmpdir, dtb))
 
     def run_bootm(test_type, expect_string):
         """Run a 'bootm' command U-Boot.
@@ -138,12 +138,14 @@ def test_vboot(u_boot_console):
                                 '-k', dtb])
 
         # Increment the first byte of the signature, which should cause failure
-        sig = util.cmd(cons, 'fdtget -t bx %s %s value' % (fit, sig_node))
+        sig = util.run_and_log(cons, 'fdtget -t bx %s %s value' %
+                               (fit, sig_node))
         byte_list = sig.split()
         byte = int(byte_list[0], 16)
         byte_list[0] = '%x' % (byte + 1)
         sig = ' '.join(byte_list)
-        util.cmd(cons, 'fdtput -t bx %s %s value %s' % (fit, sig_node, sig))
+        util.run_and_log(cons, 'fdtput -t bx %s %s value %s' %
+                         (fit, sig_node, sig))
 
         run_bootm('Signed config with bad hash', 'Bad Data Hash')
 
@@ -164,14 +166,14 @@ def test_vboot(u_boot_console):
 
     # Create an RSA key pair
     public_exponent = 65537
-    util.cmd(cons, 'openssl genpkey -algorithm RSA -out %sdev.key '
-                   '-pkeyopt rsa_keygen_bits:2048 '
-                   '-pkeyopt rsa_keygen_pubexp:%d '
-                   '2>/dev/null'  % (tmpdir, public_exponent))
+    util.run_and_log(cons, 'openssl genpkey -algorithm RSA -out %sdev.key '
+                     '-pkeyopt rsa_keygen_bits:2048 '
+                     '-pkeyopt rsa_keygen_pubexp:%d '
+                     '2>/dev/null'  % (tmpdir, public_exponent))
 
     # Create a certificate containing the public key
-    util.cmd(cons, 'openssl req -batch -new -x509 -key %sdev.key -out '
-                   '%sdev.crt' % (tmpdir, tmpdir))
+    util.run_and_log(cons, 'openssl req -batch -new -x509 -key %sdev.key -out '
+                     '%sdev.crt' % (tmpdir, tmpdir))
 
     # Create a number kernel image with zeroes
     with open('%stest-kernel.bin' % tmpdir, 'w') as fd:
diff --git a/test/py/u_boot_utils.py b/test/py/u_boot_utils.py
index e74e34231f..2ba4baed07 100644
--- a/test/py/u_boot_utils.py
+++ b/test/py/u_boot_utils.py
@@ -158,7 +158,9 @@ def run_and_log(u_boot_console, cmd, ignore_errors=False):
 
     Args:
         u_boot_console: A console connection to U-Boot.
-        cmd: The command to run, as an array of argv[].
+        cmd: The command to run, as an array of argv[], or a string.
+            If a string, note that it is split up so that quoted spaces
+            will not be preserved. E.g. "fred and" becomes ['"fred', 'and"']
         ignore_errors: Indicate whether to ignore errors. If True, the function
             will simply return if the command cannot be executed or exits with
             an error code, otherwise an exception will be raised if such
@@ -167,24 +169,13 @@ def run_and_log(u_boot_console, cmd, ignore_errors=False):
     Returns:
         The output as a string.
     """
-
+    if isinstance(cmd, str):
+        cmd = cmd.split()
     runner = u_boot_console.log.get_runner(cmd[0], sys.stdout)
     output = runner.run(cmd, ignore_errors=ignore_errors)
     runner.close()
     return output
 
-def cmd(u_boot_console, cmd_str):
-    """Run a single command string and log its output.
-
-    Args:
-        u_boot_console: A console connection to U-Boot.
-        cmd: The command to run, as a string.
-
-    Returns:
-        The output as a string.
-    """
-    return run_and_log(u_boot_console, cmd_str.split())
-
 def run_and_log_expect_exception(u_boot_console, cmd, retcode, msg):
     """Run a command that is expected to fail.