| Message ID | 1455583234-30120-1-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Accepted |
| Commit | 24862c640ea50ac88be343161eb681bea5dbfeef |
| Delegated to: | Tom Rini |
| Headers | show |
On 15 February 2016 at 17:40, Stephen Warren <swarren@wwwdotorg.org> wrote: > 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> > --- > (Resending since I forgot to Cc the list) > > test/py/tests/test_hush_if_test.py | 8 ++++++++ > 1 file changed, 8 insertions(+) Acked-by: Simon Glass <sjg@chromium.org>
On Mon, Feb 15, 2016 at 05:40:34PM -0700, Stephen Warren wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py index 8b88425a6598..1eeaa5b0471a 100644 --- a/test/py/tests/test_hush_if_test.py +++ b/test/py/tests/test_hush_if_test.py @@ -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()
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> --- (Resending since I forgot to Cc the list) test/py/tests/test_hush_if_test.py | 8 ++++++++ 1 file changed, 8 insertions(+)