Embedded_Projects/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: dm: add button_cmd test

Browse Source 
Add a test for the button_cmd feature. This validates that commands can
be mapped to two buttons, that the correct command runs based on which
button is pressed, that only 1 command is run, and that no command runs
if button_cmd_0_name is wrong or unset.

Additionally, fix a potential uninitialised variable use caught by these
tests, the btn variable in get_button_cmd() is assumed to be null if
button_get_by_label() fails, but it's actually used uninitialised in
that case.

CONFIG_BUTTON is now enabled automatically and was removed when running
save_defconfig.

Fixes: e761035b64 ("boot: add support for button commands")
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
This commit is contained in:
Caleb Connolly 2024-03-19 13:24:42 +00:00 committed by Tom Rini
parent 672af4f8ac
commit d47e1fa819
5 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/button_cmd.c
View File

@ -33,7 +33,7 @@ struct button_cmd {
static int get_button_cmd(int n, struct button_cmd *cmd)
{
const char *cmd_str;
struct udevice *btn;
struct udevice *btn = NULL;
char buf[24];
snprintf(buf, sizeof(buf), "button_cmd_%d_name", n);

1
configs/sandbox64_defconfig
View File

@ -11,6 +11,7 @@ CONFIG_SANDBOX64=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_MEMTEST_START=0x00100000
CONFIG_SYS_MEMTEST_END=0x00101000
CONFIG_BUTTON_CMD=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y

1
configs/sandbox_defconfig
View File

@ -10,6 +10,7 @@ CONFIG_PCI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_MEMTEST_START=0x00100000
CONFIG_SYS_MEMTEST_END=0x00101000
CONFIG_BUTTON_CMD=y
CONFIG_FIT=y
CONFIG_FIT_RSASSA_PSS=y
CONFIG_FIT_CIPHER=y

1
configs/sandbox_flattree_defconfig
View File

@ -8,6 +8,7 @@ CONFIG_PCI=y
CONFIG_DEBUG_UART=y
CONFIG_SYS_MEMTEST_START=0x00100000
CONFIG_SYS_MEMTEST_END=0x00101000
CONFIG_BUTTON_CMD=y
CONFIG_FIT=y
CONFIG_FIT_SIGNATURE=y
CONFIG_FIT_VERBOSE=y

96
test/dm/button.c
View File

@ -131,3 +131,99 @@ static int dm_test_button_keys_adc(struct unit_test_state *uts)
return 0;
}
DM_TEST(dm_test_button_keys_adc, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);
/* Test of the button uclass using the button_gpio driver */
static int dm_test_button_cmd(struct unit_test_state *uts)
{
struct udevice *btn1_dev, *btn2_dev, *gpio;
const char *envstr;
#define BTN1_GPIO 3
#define BTN2_GPIO 4
#define BTN1_PASS_VAR "test_button_cmds_0"
#define BTN2_PASS_VAR "test_button_cmds_1"
/*
* Buttons 1 and 2 are connected to gpio_a gpios 3 and 4 respectively.
* set the GPIOs to known values and then check that the appropriate
* commands are run when invoking process_button_cmds().
*/
ut_assertok(uclass_get_device(UCLASS_BUTTON, 1, &btn1_dev));
ut_assertok(uclass_get_device(UCLASS_BUTTON, 2, &btn2_dev));
ut_assertok(uclass_get_device(UCLASS_GPIO, 1, &gpio));
/*
* Map a command to button 1 and check that it process_button_cmds()
* runs it if called with button 1 pressed.
*/
ut_assertok(env_set("button_cmd_0_name", "button1"));
ut_assertok(env_set("button_cmd_0", "env set " BTN1_PASS_VAR " PASS"));
ut_assertok(sandbox_gpio_set_value(gpio, BTN1_GPIO, 1));
/* Sanity check that the button is actually pressed */
ut_asserteq(BUTTON_ON, button_get_state(btn1_dev));
process_button_cmds();
ut_assertnonnull((envstr = env_get(BTN1_PASS_VAR)));
ut_asserteq_str(envstr, "PASS");
/* Clear result */
ut_assertok(env_set(BTN1_PASS_VAR, NULL));
/*
* Map a command for button 2, press it, check that only the command
* for button 1 runs because it comes first and is also pressed.
*/
ut_assertok(env_set("button_cmd_1_name", "button2"));
ut_assertok(env_set("button_cmd_1", "env set " BTN2_PASS_VAR " PASS"));
ut_assertok(sandbox_gpio_set_value(gpio, BTN2_GPIO, 1));
ut_asserteq(BUTTON_ON, button_get_state(btn2_dev));
process_button_cmds();
/* Check that button 1 triggered again */
ut_assertnonnull((envstr = env_get(BTN1_PASS_VAR)));
ut_asserteq_str(envstr, "PASS");
/* And button 2 didn't */
ut_assertnull(env_get(BTN2_PASS_VAR));
/* Clear result */
ut_assertok(env_set(BTN1_PASS_VAR, NULL));
/*
* Release button 1 and check that the command for button 2 is run
*/
ut_assertok(sandbox_gpio_set_value(gpio, BTN1_GPIO, 0));
process_button_cmds();
ut_assertnull(env_get(BTN1_PASS_VAR));
/* Check that the command for button 2 ran */
ut_assertnonnull((envstr = env_get(BTN2_PASS_VAR)));
ut_asserteq_str(envstr, "PASS");
/* Clear result */
ut_assertok(env_set(BTN2_PASS_VAR, NULL));
/*
* Unset "button_cmd_0_name" and check that no commands run even
* with both buttons pressed.
*/
ut_assertok(env_set("button_cmd_0_name", NULL));
/* Press button 1 (button 2 is already pressed )*/
ut_assertok(sandbox_gpio_set_value(gpio, BTN1_GPIO, 1));
ut_asserteq(BUTTON_ON, button_get_state(btn1_dev));
process_button_cmds();
ut_assertnull(env_get(BTN1_PASS_VAR));
ut_assertnull(env_get(BTN2_PASS_VAR));
/*
* Check that no command is run if the button name is wrong.
*/
ut_assertok(env_set("button_cmd_0_name", "invalid_button"));
process_button_cmds();
ut_assertnull(env_get(BTN1_PASS_VAR));
ut_assertnull(env_get(BTN2_PASS_VAR));
#undef BTN1_PASS_VAR
#undef BTN2_PASS_VAR
#undef BTN1_GPIO
#undef BTN2_GPIO
return 0;
}
DM_TEST(dm_test_button_cmd, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT);