mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2025-09-03 21:12:10 +02:00
2a521d01e6
current env_set_default_vars() doesn't delete var that are not in the imported env. hashtable removes vars that are not in the imported env but present in the current env only if H_NOCLEAR flag is not set. This change is to avoid passing H_NOCLEAR flag if specific vars are passed to env_set_default_vars() Without this change: Marvell>> env default boot_mode Marvell>> With the change: Marvell>> env default boot_mode WARNING: 'boot_mode' not in imported env, deleting it! Signed-off-by: Ravi Minnikanti <rminnikanti@marvell.com> Reviewed-by: Simon Glass <sjg@chromium.org>
47 lines
1.4 KiB
C
47 lines
1.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* (C) Copyright 2015
|
|
* Joe Hershberger, National Instruments, joe.hershberger@ni.com
|
|
*/
|
|
|
|
#include <command.h>
|
|
#include <test/env.h>
|
|
#include <test/suites.h>
|
|
#include <test/ut.h>
|
|
|
|
static int env_test_env_cmd(struct unit_test_state *uts)
|
|
{
|
|
ut_assertok(run_command("setenv non_default_var1 1", 0));
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("setenv non_default_var2 1", 0));
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("env print non_default_var1", 0));
|
|
ut_assert_nextline("non_default_var1=1");
|
|
ut_assert_console_end();
|
|
|
|
ut_assertok(run_command("env default non_default_var1 non_default_var2", 0));
|
|
ut_assert_nextline("WARNING: 'non_default_var1' not in imported env, deleting it!");
|
|
ut_assert_nextline("WARNING: 'non_default_var2' not in imported env, deleting it!");
|
|
ut_assert_console_end();
|
|
|
|
ut_asserteq(1, run_command("env exists non_default_var1", 0));
|
|
ut_assert_console_end();
|
|
|
|
ut_asserteq(1, run_command("env exists non_default_var2", 0));
|
|
ut_assert_console_end();
|
|
|
|
return 0;
|
|
}
|
|
ENV_TEST(env_test_env_cmd, UT_TESTF_CONSOLE_REC);
|
|
|
|
int do_ut_env(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
|
|
{
|
|
struct unit_test *tests = UNIT_TEST_SUITE_START(env_test);
|
|
const int n_ents = UNIT_TEST_SUITE_COUNT(env_test);
|
|
|
|
return cmd_ut_category("environment", "env_test_",
|
|
tests, n_ents, argc, argv);
|
|
}
|