diff mbox series

[v3,5/5] test/py: efi_capsule: align with the syntax change of mkeficapsule

Message ID 20210831024659.53464-6-takahiro.akashi@linaro.org
State Superseded
Headers show
Series efi_loader: capsule: improve capsule authentication support | expand

Commit Message

AKASHI Takahiro Aug. 31, 2021, 2:46 a.m. UTC
Modify command line arguments at mkeficapsule as the syntax was
a bit modified in the previous commit.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

---
 test/py/tests/test_efi_capsule/conftest.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
2.33.0

Comments

Heinrich Schuchardt Aug. 31, 2021, 6:10 a.m. UTC | #1
On 8/31/21 4:46 AM, AKASHI Takahiro wrote:
> Modify command line arguments at mkeficapsule as the syntax was

> a bit modified in the previous commit.

>

> Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

> ---

>   test/py/tests/test_efi_capsule/conftest.py | 4 ++--

>   1 file changed, 2 insertions(+), 2 deletions(-)

>

> diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py

> index 6ad5608cd71c..8b5368c11abc 100644

> --- a/test/py/tests/test_efi_capsule/conftest.py

> +++ b/test/py/tests/test_efi_capsule/conftest.py

> @@ -50,10 +50,10 @@ def efi_capsule_data(request, u_boot_config):

>           check_call('cd %s; %s/tools/mkimage -f uboot_bin_env.its uboot_bin_env.itb' %

>                      (data_dir, u_boot_config.build_dir),

>                      shell=True)

> -        check_call('cd %s; %s/tools/mkeficapsule --fit uboot_bin_env.itb --index 1 Test01' %

> +        check_call('cd %s; %s/tools/mkeficapsule --index 1 --fit uboot_bin_env.itb Test01' %

>                      (data_dir, u_boot_config.build_dir),

>                      shell=True)

> -        check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --index 1 Test02' %

> +        check_call('cd %s; %s/tools/mkeficapsule --index 1 --raw u-boot.bin.new Test02' %

>                      (data_dir, u_boot_config.build_dir),

>                      shell=True)

>

>


Should one of the tsts use a GUID (introduced in patch 4)?

Best regards

Heinrich
AKASHI Takahiro Sept. 2, 2021, 12:39 a.m. UTC | #2
On Tue, Aug 31, 2021 at 08:10:31AM +0200, Heinrich Schuchardt wrote:
> On 8/31/21 4:46 AM, AKASHI Takahiro wrote:

> > Modify command line arguments at mkeficapsule as the syntax was

> > a bit modified in the previous commit.

> > 

> > Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

> > ---

> >   test/py/tests/test_efi_capsule/conftest.py | 4 ++--

> >   1 file changed, 2 insertions(+), 2 deletions(-)

> > 

> > diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py

> > index 6ad5608cd71c..8b5368c11abc 100644

> > --- a/test/py/tests/test_efi_capsule/conftest.py

> > +++ b/test/py/tests/test_efi_capsule/conftest.py

> > @@ -50,10 +50,10 @@ def efi_capsule_data(request, u_boot_config):

> >           check_call('cd %s; %s/tools/mkimage -f uboot_bin_env.its uboot_bin_env.itb' %

> >                      (data_dir, u_boot_config.build_dir),

> >                      shell=True)

> > -        check_call('cd %s; %s/tools/mkeficapsule --fit uboot_bin_env.itb --index 1 Test01' %

> > +        check_call('cd %s; %s/tools/mkeficapsule --index 1 --fit uboot_bin_env.itb Test01' %

> >                      (data_dir, u_boot_config.build_dir),

> >                      shell=True)

> > -        check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --index 1 Test02' %

> > +        check_call('cd %s; %s/tools/mkeficapsule --index 1 --raw u-boot.bin.new Test02' %

> >                      (data_dir, u_boot_config.build_dir),

> >                      shell=True)

> > 

> > 

> 

> Should one of the tsts use a GUID (introduced in patch 4)?


Good point. After adding an extra test, I found a bug :)
uuid_parse() in libuuid is used to convert a string
into a guid value, but uuid and guid have different formats
of representation and we can't use the return value from
uuid_parse() as it is.

-Takahiro Akashi

> Best regards

> 

> Heinrich

>
diff mbox series

Patch

diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py
index 6ad5608cd71c..8b5368c11abc 100644
--- a/test/py/tests/test_efi_capsule/conftest.py
+++ b/test/py/tests/test_efi_capsule/conftest.py
@@ -50,10 +50,10 @@  def efi_capsule_data(request, u_boot_config):
         check_call('cd %s; %s/tools/mkimage -f uboot_bin_env.its uboot_bin_env.itb' %
                    (data_dir, u_boot_config.build_dir),
                    shell=True)
-        check_call('cd %s; %s/tools/mkeficapsule --fit uboot_bin_env.itb --index 1 Test01' %
+        check_call('cd %s; %s/tools/mkeficapsule --index 1 --fit uboot_bin_env.itb Test01' %
                    (data_dir, u_boot_config.build_dir),
                    shell=True)
-        check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --index 1 Test02' %
+        check_call('cd %s; %s/tools/mkeficapsule --index 1 --raw u-boot.bin.new Test02' %
                    (data_dir, u_boot_config.build_dir),
                    shell=True)