cmd/button: return button status
v2 cover cmd/button: return button status
To make the button command useful in a shell script it should return the status of the button.
Adjust the sandbox GPIO driver to keep the output value as input when switching to input.
Adjust the device-tree labels of the sandbox GPIOs used for buttons.
Enhance the Python unit test to check the button status returned by the button command.
v2:
adjust Python test
adjust GPIO driver
Heinrich Schuchardt (3):
test: sharpen button label unit test
drivers: gpio: keep output value for input on sandbox cmd/button: return button status
arch/sandbox/dts/sandbox.dtsi | 8 ++++---- arch/sandbox/dts/test.dts | 8 ++++---- cmd/button.c | 4 ++-- drivers/gpio/sandbox.c | 10 +++++++++- test/dm/button.c | 6 +++--- test/py/tests/test_button.py | 36 ++++++++++++++++++++++++++--------- 6 files changed, 49 insertions(+), 23 deletions(-)
--
2.28.0
PATCH v2 1/3 test: sharpen button label unit test
Using different strings for the device tree node labels and the label property of buttons sharpens the button label unit test.
---
v2:
new patch
--- arch/sandbox/dts/sandbox.dtsi | 8 ++++---- arch/sandbox/dts/test.dts | 8 ++++---- test/dm/button.c | 6 +++--- test/py/tests/test_button.py | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-)
arch/sandbox/dts/sandbox.dtsi +4 -4
@@ -18,14 +18,14 @@ buttons { compatible = "gpio-keys"; - summer { + btn1 { gpios = <&gpio_a 3 0>; - label = "summer"; + label = "button1"; }; - christmas { + btn2 { gpios = <&gpio_a 4 0>; - label = "christmas"; + label = "button2"; }; };
arch/sandbox/dts/test.dts +4 -4
@@ -54,14 +54,14 @@ buttons { compatible = "gpio-keys"; - summer { + btn1 { gpios = <&gpio_a 3 0>; - label = "summer"; + label = "button1"; }; - christmas { + btn2 { gpios = <&gpio_a 4 0>; - label = "christmas"; + label = "button2"; }; };
test/dm/button.c +3 -3
@@ -57,17 +57,17 @@ static int dm_test_button_label(struct unit_test_state *uts) {struct udevice *dev, *cmp; -ut_assertok (button_get_by_label ("summer" , &dev)); +ut_assertok (button_get_by_label ("button1" , &dev));ut_asserteq (1 ,device_active (dev));ut_assertok (uclass_get_device (UCLASS_BUTTON ,1 , &cmp));ut_asserteq_ptr (dev, cmp); -ut_assertok (button_get_by_label ("christmas" , &dev)); +ut_assertok (button_get_by_label ("button2" , &dev));ut_asserteq (1 ,device_active (dev));ut_assertok (uclass_get_device (UCLASS_BUTTON ,2 , &cmp));ut_asserteq_ptr (dev, cmp); -ut_asserteq (-ENODEV ,button_get_by_label ("spring" , &dev)); +ut_asserteq (-ENODEV ,button_get_by_label ("nobutton" , &dev));return 0 ; }
test/py/tests/test_button.py +1 -1
@@ -11,7 +11,7 @@ def test_button_exit_statuses(u_boot_console): expected_response = 'rc:0' response = u_boot_console.run_command('button list; echo rc:$?') assert(expected_response in response) - response = u_boot_console.run_command('button summer; echo rc:$?') + response = u_boot_console.run_command('button button1; echo rc:$?') assert(expected_response in response) expected_response = 'rc:1'
--
2.28.0
PATCH v2 1/3 test: sharpen button label unit test
Quoted 5 lines
Using different strings for the device tree node labels and the label property of buttons sharpens the button label unit test.
Signed-off-by Heinrich Schuchardt <[email protected]>
Quoted 96 lines
---
v2:
new patch
---arch/sandbox/dts/sandbox.dtsi| 8 ++++----arch/sandbox/dts/test.dts| 8 ++++----test/dm/button.c| 6 +++---test/py/tests/test_button.py| 2 +-4 files changed, 12 insertions(+), 12 deletions(-)arch/sandbox/dts/sandbox.dtsi +4
-4@@ -18,14 +18,14 @@ buttons { compatible = "gpio-keys"; - summer { + btn1 { gpios = <&gpio_a 3 0>; - label = "summer"; + label = "button1"; }; - christmas { + btn2 { gpios = <&gpio_a 4 0>; - label = "christmas"; + label = "button2"; }; };arch/sandbox/dts/test.dts +4
-4@@ -54,14 +54,14 @@ buttons { compatible = "gpio-keys"; - summer { + btn1 { gpios = <&gpio_a 3 0>; - label = "summer"; + label = "button1"; }; - christmas { + btn2 { gpios = <&gpio_a 4 0>; - label = "christmas"; + label = "button2"; }; };test/dm/button.c +3
-3@@ -57,17 +57,17 @@ static int dm_test_button_label(struct unit_test_state *uts) {struct udevice *dev, *cmp; -ut_assertok (button_get_by_label ("summer" , &dev)); +ut_assertok (button_get_by_label ("button1" , &dev));ut_asserteq (1 ,device_active (dev));ut_assertok (uclass_get_device (UCLASS_BUTTON ,1 , &cmp));ut_asserteq_ptr (dev, cmp); -ut_assertok (button_get_by_label ("christmas" , &dev)); +ut_assertok (button_get_by_label ("button2" , &dev));ut_asserteq (1 ,device_active (dev));ut_assertok (uclass_get_device (UCLASS_BUTTON ,2 , &cmp));ut_asserteq_ptr (dev, cmp); -ut_asserteq (-ENODEV ,button_get_by_label ("spring" , &dev)); +ut_asserteq (-ENODEV ,button_get_by_label ("nobutton" , &dev));return 0 ; }test/py/tests/test_button.py +0
-0@@ -11,7 +11,7 @@ def test_button_exit_statuses(u_boot_console):
expected_response= 'rc:0'
response =u_boot_console.run_command('button list; echo rc:$?')assert(expected_response in response)
- response =u_boot_console.run_command('button summer; echo rc:$?')
+ response =u_boot_console.run_command('button button1; echo rc:$?')assert(expected_response in response)
expected_response= 'rc:1'
--
2.28.0
PATCH v2 1/3 test: sharpen button label unit test
In reply to Heinrich SchuchardtQuoted 5 lines · Heinrich Schuchardt
Using different strings for the device tree node labels and the label property of buttons sharpens the button label unit test.
Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201014/08775513/attachment.sig>
PATCH v2 2/3 drivers: gpio: keep output value for input on sandbox
In reply to Heinrich SchuchardtFor testing purposes keep the output value when switching to input. This allows us to manipulate the input value via the gpio command.
---
v2:
new patch
--- drivers/gpio/sandbox.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/gpio/sandbox.c +9 -1
@@ -185,7 +185,15 @@ static int sb_gpio_set_dir_flags(struct udevice *dev, unsigned int offset, dir_flags =get_gpio_dir_flags (dev, offset); - *dir_flags = flags; +/* +* For testing purposes keep the output value when switching to input. +* This allows us to manipulate the input value via the gpio command. +*/ +if (flags &GPIOD_IS_IN ) + *dir_flags = (flags & ~GPIOD_IS_OUT_ACTIVE ) | + (*dir_flags &GPIOD_IS_OUT_ACTIVE ); +else + *dir_flags = flags;return 0 ; }
--
2.28.0
PATCH v2 2/3 drivers: gpio: keep output value for input on sandbox
Quoted 5 lines
For testing purposes keep the output value when switching to input. This allows us to manipulate the input value via the gpio command.
Signed-off-by Heinrich Schuchardt <[email protected]>
Quoted 31 lines
---
v2:
new patch
---drivers/gpio/sandbox.c| 10 +++++++++-1 file changed, 9 insertions(+), 1 deletion(-)drivers/gpio/sandbox.c +9
-1@@ -185,7 +185,15 @@ static int sb_gpio_set_dir_flags(struct udevice *dev,unsigned int offset, dir_flags =get_gpio_dir_flags (dev, offset); - *dir_flags = flags; +/* +* For testing purposes keep the output value when switching to input. +* This allows us to manipulate the input value via the gpio command. +*/ +if (flags &GPIOD_IS_IN ) + *dir_flags = (flags & ~GPIOD_IS_OUT_ACTIVE ) | + (*dir_flags &GPIOD_IS_OUT_ACTIVE ); +else + *dir_flags = flags;return 0 ;}
--
2.28.0
PATCH v2 2/3 drivers: gpio: keep output value for input on sandbox
In reply to Heinrich SchuchardtQuoted 5 lines · Heinrich Schuchardt
For testing purposes keep the output value when switching to input. This allows us to manipulate the input value via the gpio command.
Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201014/b8f1de05/attachment.sig>
PATCH v2 3/3 cmd/button: return button status
In reply to Heinrich SchuchardtTo make the button command useful in a shell script it should return the status of the button:
* 0 (true) - pressed, on
* 1 (false) - not pressed, off
The button command takes only one argument. Correct maxargs.
Adjust the Python unit test.
---
v2:
adjust Python unit test
--- cmd/button.c | 4 ++-- test/py/tests/test_button.py | 34 ++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 10 deletions(-)
cmd/button.c +2 -2
@@ -75,11 +75,11 @@ int do_button(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) ret =show_button_state (dev); -return 0 ; +return !ret; }U_BOOT_CMD ( - button,4 ,1 , do_button, + button,2 ,1 , do_button,"manage buttons" ,"<button_label> \tGet button state\n" "button list\t\tShow a list of buttons"
test/py/tests/test_button.py +26 -8
@@ -4,16 +4,34 @@ import pytest @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_button') -def test_button_exit_statuses(u_boot_console): - """Test that non-input button commands correctly return the command - success/failure status.""" +def test_button_list(u_boot_console): + """Test listing buttons""" - expected_response = 'rc:0' response = u_boot_console.run_command('button list; echo rc:$?') - assert(expected_response in response) + assert('button1' in response) + assert('button2' in response) + assert('rc:0' in response) + + at pytest.mark.boardspec('sandbox') + at pytest.mark.buildconfigspec('cmd_button') + at pytest.mark.buildconfigspec('cmd_gpio') +def test_button_return_code(u_boot_console): + """Test correct reporting of the button status + + The sandbox gpio driver reports the last output value as input value. + We can use this in our test to emulate different input statuses. + """ + + u_boot_console.run_command('gpio set a3; gpio input a3'); + response = u_boot_console.run_command('button button1; echo rc:$?') + assert('on' in response) + assert('rc:0' in response) + + u_boot_console.run_command('gpio clear a3; gpio input a3'); response = u_boot_console.run_command('button button1; echo rc:$?') - assert(expected_response in response) + assert('off' in response) + assert('rc:1' in response) - expected_response = 'rc:1' response = u_boot_console.run_command('button nonexistent-button; echo rc:$?') - assert(expected_response in response) + assert('not found' in response) + assert('rc:1' in response)
--
2.28.0
PATCH v2 3/3 cmd/button: return button status
Quoted 4 lines
To make the button command useful in a shell script it should return the status of the button:
Quoted 8 lines
* 0 (true) - pressed, on
* 1 (false) - not pressed, offThe button command takes only one argument. Correct maxargs.
Adjust the Python unit test.
Signed-off-by Heinrich Schuchardt <[email protected]>
Quoted 76 lines
---
v2:
adjust Python unit test
---cmd/button.c| 4 ++--test/py/tests/test_button.py| 34 ++++++++++++++++++++++++++--------2 files changed, 28 insertions(+), 10 deletions(-)cmd/button.c +1
-1@@ -75,11 +75,11 @@ int do_button(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) ret =show_button_state (dev); -return 0 ; +return !ret; }U_BOOT_CMD(
- button, 4, 1,do_button,
+ button, 2, 1,do_button,
"manage buttons",
"<button_label> \tGet button state\n"
"button list\t\tShow a list of buttons"test/py/tests/test_button.py +26
-9@@ -4,16 +4,34 @@ import pytest @pytest.mark.boardspec('sandbox') @pytest.mark.buildconfigspec('cmd_button') -def test_button_exit_statuses(u_boot_console): - """Test that non-input button commands correctly return the command - success/failure status.""" +def test_button_list(u_boot_console): + """Test listing buttons""" - expected_response = 'rc:0' response = u_boot_console.run_command('button list; echo rc:$?') - assert(expected_response in response) + assert('button1' in response) + assert('button2' in response) + assert('rc:0' in response) + + at pytest.mark.boardspec('sandbox') + at pytest.mark.buildconfigspec('cmd_button') + at pytest.mark.buildconfigspec('cmd_gpio') +def test_button_return_code(u_boot_console): + """Test correct reporting of the button status + + The sandbox gpio driver reports the last output value as input value. + We can use this in our test to emulate different input statuses. + """ + + u_boot_console.run_command('gpio set a3; gpio input a3'); + response = u_boot_console.run_command('button button1; echo rc:$?') + assert('on' in response) + assert('rc:0' in response) + + u_boot_console.run_command('gpio clear a3; gpio input a3'); response = u_boot_console.run_command('button button1; echo rc:$?') - assert(expected_response in response) + assert('off' in response) + assert('rc:1' in response) - expected_response = 'rc:1' response = u_boot_console.run_command('button nonexistent-button; echo rc:$?') - assert(expected_response in response) + assert('not found' in response) + assert('rc:1' in response) --2.28.0
PATCH v2 3/3 cmd/button: return button status
In reply to Heinrich SchuchardtQuoted 6 lines · Heinrich Schuchardt
To make the button command useful in a shell script it should return the status of the button:
* 0 (true) - pressed, on
* 1 (false) - not pressed, off
Quoted 6 lines
The button command takes only one argument. Correct maxargs.
Adjust the Python unit test.
Signed-off-by Heinrich Schuchardt <[email protected]>Reviewed-by Philippe Reynes <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201014/3144af59/attachment.sig>