]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
test/py: skip tests that require large CONFIG_SYS_MAXARGS
authorStephen Warren <swarren@wwwdotorg.org>
Tue, 16 Feb 2016 00:40:34 +0000 (17:40 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 26 Feb 2016 13:42:12 +0000 (08:42 -0500)
test_hush_if_test.py executes commands that require large values of
CONFIG_SYS_MAXARGS. Detect cases where the configured value is too low
and skip those tests.

Ideally, this would be implemented inside console.run_command(). However,
the command passed to that function is already a completely formed string,
and determining its argument count usage would require splitting commands
at ;, handling quoting to deal with arguments containing spaces, etc. Even
passing the command as a list wouldn't solve all these issues, since we'd
still need to split commands on ; and deal with cases like "if test ..."
which consumes 0 of the argument count.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Acked-by: Simon Glass <sjg@chromium.org>
test/py/tests/test_hush_if_test.py

index 8b88425a6598ea40b16842f33691ee6cf82a8319..1eeaa5b0471a1f52a1cc661d35432b01ffa0006a 100644 (file)
@@ -97,6 +97,14 @@ subtests = (
 def exec_hush_if(u_boot_console, expr, result):
     """Execute a shell "if" command, and validate its result."""
 
+    config = u_boot_console.config.buildconfig
+    maxargs = int(config.get('config_sys_maxargs', '0'))
+    args = len(expr.split(' ')) - 1
+    if args > maxargs:
+        u_boot_console.log.warning('CONFIG_SYS_MAXARGS too low; need ' +
+            str(args))
+        pytest.skip()
+
     cmd = 'if ' + expr + '; then echo true; else echo false; fi'
     response = u_boot_console.run_command(cmd)
     assert response.strip() == str(result).lower()