| Message ID | 1465281085-10481-3-git-send-email-hs@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Jun 07, 2016 at 08:31:15AM +0200, Heiko Schocher wrote: > if CONFIG_VERSION_VARIABLE is set, the U-Boot environment > contains a "vers" variable with the current U-Boot version > string. If now "printenv" is called, test/py fails as it > detects the main_sign string, which is in this case correct. > > So check only the main_sign as an error, if CONFIG_VERSION_VARIABLE > is not set. > > Signed-off-by: Heiko Schocher <hs@denx.de> Applied to u-boot/master, thanks!
diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index c41aa5a..22a22d1 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -39,7 +39,11 @@ class StateTestEnv(object): Nothing. """ - response = self.u_boot_console.run_command('printenv') + if self.u_boot_console.config.buildconfig['config_version_variable'] == 'y': + with self.u_boot_console.disable_check('main_signon'): + response = self.u_boot_console.run_command('printenv') + else: + response = self.u_boot_console.run_command('printenv') self.env = {} for l in response.splitlines(): if not '=' in l:
if CONFIG_VERSION_VARIABLE is set, the U-Boot environment contains a "vers" variable with the current U-Boot version string. If now "printenv" is called, test/py fails as it detects the main_sign string, which is in this case correct. So check only the main_sign as an error, if CONFIG_VERSION_VARIABLE is not set. Signed-off-by: Heiko Schocher <hs@denx.de> --- Changes in v3: None Changes in v2: None test/py/tests/test_env.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)