cmd: env: add option for quiet output on env info
Subsystems (3)
v5 cover cmd: env: add option for quiet output on env info
Hi,
It is a V5 for [1] serie.
I add the -q option for 'env info' command and I also add pytest for this command.
Test for ENV_IS_IN_DEVICE is included in separate serie [2] (I will activate ENV_IS_IN_EXT4 support in sandbox)
To avoid compilation warning, I add prototype for env_get_location for the patch 3/7
"cmd: env: check real location for env info command" as it is done in [3].
[1] http://patchwork.ozlabs.org/project/uboot/list/?series=183438
[2] http://patchwork.ozlabs.org/project/uboot/list/?series=158160
[3] http://patchwork.ozlabs.org/patch/1230200/
Changes in v5:
- allow to execute cmd_nvedit_info on real board
- rename test_env_info_quiet to test_env_info_sandbox
Changes in v4:
- rebase on master branch
- move 5/7 stm32mp1: configs: activate CMD_ERASEENV in a new serie 183380
- move 2/7 and 4/7 in a new serie 183387
Changes in v3:
- update commit message (sub-commandi)
- rename test_env_info_test to test_env_info_quiet
Changes in v2:
- update prototype in env_internal.h as done in "env: add prototypes for weak function"
- remove comment change in env.c (implementation information)
- move env_location declaration
- activate env info command in sandbox (new)
- add pytest test_env_info and test_env_info_test (new)
Patrick Delaunay (5):
stm32mp1: use the command env info in env_check
cmd: env: add option for quiet output on env info
cmd: env: check real location for env info command
configs: sandbox: Enable sub command 'env info'
test: env: add test for env info sub-command
arch/arm/mach-stm32mp/Kconfig | 1 + cmd/Kconfig | 1 + cmd/nvedit.c | 37 ++++++++++++++---- configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + include/configs/stm32mp1.h | 4 +- include/env_internal.h | 11 ++++++ test/py/tests/test_env.py | 63 ++++++++++++++++++++++++++++++ 10 files changed, 110 insertions(+), 11 deletions(-)
Signature · 1 line
2.17.1
PATCH v5 1/5 stm32mp1: use the command env info in env_check
Activate CMD_NVEDIT_INFO and use the new command "env info -d -p -q" to automatically save the environment on first boot.
This patch allows to remove the env_default variable.
Previously sent in serie
cmd: env: add option for quiet output on env info
http://patchwork.ozlabs.org/project/uboot/list/?series=158105
Resend as separate serie without the "-q" option.
END
---
(no changes since v1)
arch/arm/mach-stm32mp/Kconfig | 1 + include/configs/stm32mp1.h | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-)
arch/arm/mach-stm32mp/Kconfig +1 -0
@@ -46,6 +46,7 @@ config STM32MP15x select STM32_RESET select STM32_SERIAL select SYS_ARCH_TIMER + imply CMD_NVEDIT_INFO imply SYSRESET_PSCI if TFABOOT imply SYSRESET_SYSCON if !TFABOOT help
include/configs/stm32mp1.h +1 -3
@@ -155,9 +155,7 @@"splashimage=0xc4300000\0" \"ramdisk_addr_r=0xc4400000\0" \"altbootcmd=run bootcmd\0" \ -"env_default=1\0" \ -"env_check=if test $env_default -eq 1;" \ -" then env set env_default 0;env save;fi\0" \ +"env_check=if env info -p -d; then env save; fi\0" \STM32MP_BOOTCMD \BOOTENV \"boot_net_usb_start=true\0"
Signature · 1 line
2.17.1
PATCH v5 2/5 cmd: env: add option for quiet output on env info
In reply to Patrick DelaunayThe "env info" can be use for test with -d and -p parameter, in scripting case the output of the command is not needed.
This patch allows to deactivate this output with a new option "-q".
For example, we can save the environment if default environment is used and persistent storage is managed with:
if env info -p -d -q; then env save; fi
Without the quiet option, I have the unnecessary traces First boot:
Default environment is used
Environment can be persisted
Saving Environment to EXT4... File System is consistent
Next boot:
Environment was loaded from persistent storage Environment can be persisted
---
(no changes since v1)
cmd/Kconfig | 1 + cmd/nvedit.c | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-)
cmd/Kconfig +1 -0
@@ -607,6 +607,7 @@ config CMD_NVEDIT_INFO This command can be optionally used for evaluation in scripts: [-d] : evaluate whether default environment is used [-p] : evaluate whether environment can be persisted + [-q] : quiet output The result of multiple evaluations will be combined with AND. endmenu
cmd/nvedit.c +19 -7
@@ -1224,12 +1224,15 @@ static int print_env_info(void)* env info - display environment information * env info [-d] - evaluate whether default environment is used * env info [-p] - evaluate whether environment can be persisted +* Add [-q] - quiet mode, use only for command result, for test by example: +* test env info -p -d -q */ static int do_env_info (struct cmd_tbl *cmdtp,int flag,int argc,char *const argv[]) {int eval_flags =0 ;int eval_results =0 ; +bool quiet = false;/* display environment information */ if (argc <=1 )
@@ -1247,6 +1250,9 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,case 'p' : eval_flags |=ENV_INFO_IS_PERSISTED ;break ; +case 'q' : + quiet = true; +break ;default :return CMD_RET_USAGE ; }
@@ -1256,20 +1262,24 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,/* evaluate whether default environment is used */ if (eval_flags &ENV_INFO_IS_DEFAULT ) {if (gd->flags &GD_FLG_ENV_DEFAULT ) { -printf ("Default environment is used\n" ); +if (!quiet) +printf ("Default environment is used\n" ); eval_results |=ENV_INFO_IS_DEFAULT ; }else { -printf ("Environment was loaded from persistent storage\n" ); +if (!quiet) +printf ("Environment was loaded from persistent storage\n" ); } }/* evaluate whether environment can be persisted */ if (eval_flags &ENV_INFO_IS_PERSISTED ) {#if defined(CONFIG_CMD_SAVEENV ) && defined(ENV_IS_IN_DEVICE ) -printf ("Environment can be persisted\n" ); +if (!quiet) +printf ("Environment can be persisted\n" ); eval_results |=ENV_INFO_IS_PERSISTED ;#else -printf ("Environment cannot be persisted\n" ); +if (!quiet) +printf ("Environment cannot be persisted\n" );#endif }
@@ -1326,7 +1336,7 @@ static struct cmd_tbl cmd_env_sub[] = { U_BOOT_CMD_MKENT(import, 5, 0, do_env_import, "", ""),#endif #if defined(CONFIG_CMD_NVEDIT_INFO ) - U_BOOT_CMD_MKENT(info, 2, 0, do_env_info, "", ""), + U_BOOT_CMD_MKENT(info, 3, 0, do_env_info, "", ""), #endif U_BOOT_CMD_MKENT(print, CONFIG_SYS_MAXARGS, 1, do_env_print, "", ""),#if defined(CONFIG_CMD_RUN )
@@ -1405,8 +1415,10 @@ static char env_help_text[] =#endif #if defined(CONFIG_CMD_NVEDIT_INFO )"env info - display environment information\n" -"env info [-d] - whether default environment is used\n" - "env info [-p] - whether environment can be persisted\n" +"env info [-d] [-p] [-q] - evaluate environment information\n" +" \"-d\": default environment is used\n" +" \"-p\": environment can be persisted\n" + " \"-q\": quiet output\n"#endif "env print [-a | name ...] - print environment\n"#if defined(CONFIG_CMD_NVEDIT_EFI )
Signature · 1 line
2.17.1
PATCH v5 3/5 cmd: env: check real location for env info command
In reply to Patrick DelaunayCheck the current ENV location, dynamically provided by the weak function env_get_location to be sure that the environment can be persistent.
The compilation flag ENV_IS_IN_DEVICE is not enough when the board dynamically select the available storage location (according boot device for example).
This patch solves issue for stm32mp1 platform, when the boot device is USB.
---
(no changes since v2)
Changes in v2:
- update prototype in env_internal.h as done in "env: add prototypes for weak function"
- remove comment change in env.c (implementation information)
- move env_location declaration
cmd/nvedit.c | 15 ++++++++++++--- include/env_internal.h | 11 +++++++++++ 2 files changed, 23 insertions(+), 3 deletions(-)
cmd/nvedit.c +12 -3
@@ -1233,6 +1233,9 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,int eval_flags =0 ;int eval_results =0 ;bool quiet = false; +#if defined(CONFIG_CMD_SAVEENV ) && defined(ENV_IS_IN_DEVICE ) +enum env_location loc; +#endif /* display environment information */ if (argc <=1 )
@@ -1274,9 +1277,15 @@ static int do_env_info(struct cmd_tbl *cmdtp, int flag,/* evaluate whether environment can be persisted */ if (eval_flags &ENV_INFO_IS_PERSISTED ) {#if defined(CONFIG_CMD_SAVEENV ) && defined(ENV_IS_IN_DEVICE ) -if (!quiet) -printf ("Environment can be persisted\n" ); - eval_results |=ENV_INFO_IS_PERSISTED ; + loc =env_get_location (ENVOP_SAVE , gd->env_load_prio); +if (ENVL_NOWHERE != loc &&ENVL_UNKNOWN != loc) { +if (!quiet) +printf ("Environment can be persisted\n" ); + eval_results |=ENV_INFO_IS_PERSISTED ; + }else { +if (!quiet) +printf ("Environment cannot be persisted\n" ); + }#else if (!quiet)printf ("Environment cannot be persisted\n" );
include/env_internal.h +11 -0
@@ -211,6 +211,17 @@ struct env_driver {extern struct hsearch_data env_htab; +/** +* env_get_location()- Provide the best location for the U-Boot environment +* +* It is a weak function allowing board to overidde the environment location +* +* @op: operations performed on the environment +* @prio: priority between the multiple environments, 0 being the +* highest priority +* @return an enum env_location value on success, or -ve error code. +*/ +enum env_location env_get_location (enum env_operation op,int prio);#endif /* DO_DEPS_ONLY */ #endif /* _ENV_INTERNAL_H_ */
Signature · 1 line
2.17.1
PATCH v5 4/5 configs: sandbox: Enable sub command 'env info'
In reply to Patrick DelaunayEnable support for sub command 'env info' in sandbox with CONFIG_CMD_NVEDIT_INFO. This is aimed primarily at adding unit test.
---
(no changes since v2)
Changes in v2:
- activate env info command in sandbox (new)
configs/sandbox64_defconfig | 1 + configs/sandbox_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + 4 files changed, 4 insertions(+)
configs/sandbox64_defconfig +1 -0
@@ -30,6 +30,7 @@ CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_NVEDIT_INFO=y CONFIG_LOOPW=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_MEMINFO=y
configs/sandbox_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_ENV_FLAGS=y CONFIG_CMD_NVEDIT_EFI=y +CONFIG_CMD_NVEDIT_INFO=y CONFIG_LOOPW=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_MEMINFO=y
configs/sandbox_flattree_defconfig +1 -0
@@ -24,6 +24,7 @@ CONFIG_CMD_BOOTEFI_HELLO=y # CONFIG_CMD_ELF is not set CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y +CONFIG_CMD_NVEDIT_INFO=y CONFIG_LOOPW=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_MEMINFO=y
configs/sandbox_spl_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_CMD_ASKENV=y CONFIG_CMD_GREPENV=y CONFIG_CMD_ENV_CALLBACK=y CONFIG_CMD_ENV_FLAGS=y +CONFIG_CMD_NVEDIT_INFO=y CONFIG_LOOPW=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_MEMINFO=y
Signature · 1 line
2.17.1
PATCH v5 5/5 test: env: add test for env info sub-command
In reply to Patrick DelaunayAdd a pytest for testing the env info sub-command:
test_env_info: test command with several option that can be executed on real hardware device without assumption
test_env_info_sandbox: test the result on sandbox with a known ENV configuration: ready & default & persistent
The quiet option '-q' is used for support in shell test; for example:
if env info -p -d -q; then env save; fi
---
Changes in v5:
- allow to execute cmd_nvedit_info on real board
- rename test_env_info_quiet to test_env_info_sandbox
Changes in v4:
- rebase on master branch
- move 5/7 stm32mp1: configs: activate CMD_ERASEENV in a new serie 183380
- move 2/7 and 4/7 in a new serie 183387
Changes in v3:
- update commit message (sub-commandi)
- rename test_env_info_test to test_env_info_quiet
Changes in v2:
- add pytest test_env_info and test_env_info_test (new)
test/py/tests/test_env.py | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+)
test/py/tests/test_env.py +63 -0
@@ -336,3 +336,66 @@ def test_env_import_whitelist_delete(state_test_env): unset_var(state_test_env, 'foo2') unset_var(state_test_env, 'foo3') unset_var(state_test_env, 'foo4') + + at pytest.mark.buildconfigspec('cmd_nvedit_info') +def test_env_info(state_test_env): + + """Test 'env info' command with all possible options. + """ + c = state_test_env.u_boot_console + + response = c.run_command('env info') + nb_line = 0 + for l in response.split('\n'): + if 'env_valid = ' in l: + assert '= invalid' in l or '= valid' in l or '= redundant' in l + nb_line += 1 + elif 'env_ready =' in l or 'env_use_default =' in l: + assert '= true' in l or '= false' in l + nb_line += 1 + else: + assert true + assert nb_line == 3 + + response = c.run_command('env info -p -d') + assert 'Default environment is used' in response or "Environment was loaded from persistent storage" in response + assert 'Environment can be persisted' in response or "Environment cannot be persisted" in response + + response = c.run_command('env info -p -d -q') + assert response == "" + + response = c.run_command('env info -p -q') + assert response == "" + + response = c.run_command('env info -d -q') + assert response == "" + + at pytest.mark.boardspec('sandbox') + at pytest.mark.buildconfigspec('cmd_nvedit_info') + at pytest.mark.buildconfigspec('cmd_echo') +def test_env_info_sandbox(state_test_env): + + """Test 'env info' command result with several options on sandbox + with a known ENV configuration: ready & default & persistent + """ + c = state_test_env.u_boot_console + + response = c.run_command('env info') + assert 'env_ready = true' in response + assert 'env_use_default = true' in response + + response = c.run_command('env info -p -d') + assert 'Default environment is used' in response + assert 'Environment cannot be persisted' in response + + response = c.run_command('env info -d -q') + response = c.run_command('echo $?') + assert response == "0" + + response = c.run_command('env info -p -q') + response = c.run_command('echo $?') + assert response == "1" + + response = c.run_command('env info -d -p -q') + response = c.run_command('echo $?') + assert response == "1"
Signature · 1 line
2.17.1