| Message ID | 20210510082133.44225-1-takahiro.akashi@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | test/py: efi_capsule: aligned with efidebug syntax changes | expand |
On 5/10/21 10:21 AM, AKASHI Takahiro wrote: In the subject: %s/aligned/align/ > After the commit c70f44817d46 ("efi_loader: simplify 'printenv -e'"), > "-all" option is no longer necessary. > Just remove them in the test script. 'env print -e -all Capsule0000' leads to an error CMD_RET_USAGE. Capsule0000 does not necessarily exist. Shouldn't we print CapsuleLast and CapsuleMax and check their value instead? Shouldn't we restrict the output to EFI_CAPSULE_REPORT_GUID to be sure that the GUID of these variables is correct? Best regards Heinrich > > Fixes: c70f44817d46 ("efi_loader: simplify 'printenv -e'") > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > --- > test/py/tests/test_efi_capsule/test_capsule_firmware.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware.py b/test/py/tests/test_efi_capsule/test_capsule_firmware.py > index 4697ca6f1c5c..9eeaae27d626 100644 > --- a/test/py/tests/test_efi_capsule/test_capsule_firmware.py > +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware.py > @@ -85,7 +85,7 @@ class TestEfiCapsuleFirmwareFit(object): > > # need to run uefi command to initiate capsule handling > output = u_boot_console.run_command( > - 'env print -e -all Capsule0000') > + 'env print -e Capsule0000') > > output = u_boot_console.run_command_list([ > 'host bind 0 %s' % disk_img, > @@ -160,7 +160,7 @@ class TestEfiCapsuleFirmwareFit(object): > > # need to run uefi command to initiate capsule handling > output = u_boot_console.run_command( > - 'env print -e -all Capsule0000') > + 'env print -e Capsule0000') > > output = u_boot_console.run_command_list([ > 'host bind 0 %s' % disk_img, > @@ -227,7 +227,7 @@ class TestEfiCapsuleFirmwareFit(object): > > # need to run uefi command to initiate capsule handling > output = u_boot_console.run_command( > - 'env print -e -all Capsule0000') > + 'env print -e Capsule0000') > > output = u_boot_console.run_command_list(['efidebug capsule esrt']) > >
On Thu, May 20, 2021 at 05:14:36AM +0200, Heinrich Schuchardt wrote: > On 5/10/21 10:21 AM, AKASHI Takahiro wrote: > > In the subject: %s/aligned/align/ I think that the passive usage is grammatically correct here, but I can fix it if you like. > > After the commit c70f44817d46 ("efi_loader: simplify 'printenv -e'"), > > "-all" option is no longer necessary. > > Just remove them in the test script. > > 'env print -e -all Capsule0000' leads to an error CMD_RET_USAGE. > > Capsule0000 does not necessarily exist. Shouldn't we print CapsuleLast > and CapsuleMax and check their value instead? > > Shouldn't we restrict the output to EFI_CAPSULE_REPORT_GUID to be sure > that the GUID of these variables is correct? No. The whole aim of executing "env print -e" (or whatever else command) was to invoke efi_init_obj_list(), hence efi_launch_capsules(). We don't have to care whether it fails or not. In fact, this test case still works correctly even with "--all". So this patch is just a cleanup. I will repost it. -Takahiro Akashi > Best regards > > Heinrich > > > > > Fixes: c70f44817d46 ("efi_loader: simplify 'printenv -e'") > > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> > > --- > > test/py/tests/test_efi_capsule/test_capsule_firmware.py | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware.py b/test/py/tests/test_efi_capsule/test_capsule_firmware.py > > index 4697ca6f1c5c..9eeaae27d626 100644 > > --- a/test/py/tests/test_efi_capsule/test_capsule_firmware.py > > +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware.py > > @@ -85,7 +85,7 @@ class TestEfiCapsuleFirmwareFit(object): > > > > # need to run uefi command to initiate capsule handling > > output = u_boot_console.run_command( > > - 'env print -e -all Capsule0000') > > + 'env print -e Capsule0000') > > > > output = u_boot_console.run_command_list([ > > 'host bind 0 %s' % disk_img, > > @@ -160,7 +160,7 @@ class TestEfiCapsuleFirmwareFit(object): > > > > # need to run uefi command to initiate capsule handling > > output = u_boot_console.run_command( > > - 'env print -e -all Capsule0000') > > + 'env print -e Capsule0000') > > > > output = u_boot_console.run_command_list([ > > 'host bind 0 %s' % disk_img, > > @@ -227,7 +227,7 @@ class TestEfiCapsuleFirmwareFit(object): > > > > # need to run uefi command to initiate capsule handling > > output = u_boot_console.run_command( > > - 'env print -e -all Capsule0000') > > + 'env print -e Capsule0000') > > > > output = u_boot_console.run_command_list(['efidebug capsule esrt']) > > > > >
diff --git a/test/py/tests/test_efi_capsule/test_capsule_firmware.py b/test/py/tests/test_efi_capsule/test_capsule_firmware.py index 4697ca6f1c5c..9eeaae27d626 100644 --- a/test/py/tests/test_efi_capsule/test_capsule_firmware.py +++ b/test/py/tests/test_efi_capsule/test_capsule_firmware.py @@ -85,7 +85,7 @@ class TestEfiCapsuleFirmwareFit(object): # need to run uefi command to initiate capsule handling output = u_boot_console.run_command( - 'env print -e -all Capsule0000') + 'env print -e Capsule0000') output = u_boot_console.run_command_list([ 'host bind 0 %s' % disk_img, @@ -160,7 +160,7 @@ class TestEfiCapsuleFirmwareFit(object): # need to run uefi command to initiate capsule handling output = u_boot_console.run_command( - 'env print -e -all Capsule0000') + 'env print -e Capsule0000') output = u_boot_console.run_command_list([ 'host bind 0 %s' % disk_img, @@ -227,7 +227,7 @@ class TestEfiCapsuleFirmwareFit(object): # need to run uefi command to initiate capsule handling output = u_boot_console.run_command( - 'env print -e -all Capsule0000') + 'env print -e Capsule0000') output = u_boot_console.run_command_list(['efidebug capsule esrt'])
After the commit c70f44817d46 ("efi_loader: simplify 'printenv -e'"), "-all" option is no longer necessary. Just remove them in the test script. Fixes: c70f44817d46 ("efi_loader: simplify 'printenv -e'") Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org> --- test/py/tests/test_efi_capsule/test_capsule_firmware.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.31.0