All of lore.kernel.org
 help / color / mirror / Atom feed
From: AKASHI Takahiro <takahiro.akashi@linaro.org>
To: u-boot@lists.denx.de
Subject: [PATCH v5 7/8] test/py: efi_secboot: small rework for adding a new test
Date: Tue, 21 Jul 2020 19:35:23 +0900	[thread overview]
Message-ID: <20200721103524.5956-8-takahiro.akashi@linaro.org> (raw)
In-Reply-To: <20200721103524.5956-1-takahiro.akashi@linaro.org>

It won't be very useful to customize HELLO_PATH and EFI_SECBOOT_IMAGE_NAME
under the current code base. So just remove them.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
---
 test/py/tests/test_efi_secboot/conftest.py | 10 +++-------
 test/py/tests/test_efi_secboot/defs.py     |  6 ------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/test/py/tests/test_efi_secboot/conftest.py b/test/py/tests/test_efi_secboot/conftest.py
index c0943b62501d..70a0b9183611 100644
--- a/test/py/tests/test_efi_secboot/conftest.py
+++ b/test/py/tests/test_efi_secboot/conftest.py
@@ -25,13 +25,8 @@ def efi_boot_env(request, u_boot_config):
     Return:
         A path to disk image to be used for testing
     """
-    global HELLO_PATH
-
     image_path = u_boot_config.persistent_data_dir
-    image_path = image_path + '/' + EFI_SECBOOT_IMAGE_NAME
-
-    if HELLO_PATH == '':
-        HELLO_PATH = u_boot_config.build_dir + '/lib/efi_loader/helloworld.efi'
+    image_path = image_path + '/test_efi_secboot.img'
 
     try:
         mnt_point = u_boot_config.build_dir + '/mnt_efisecure'
@@ -98,7 +93,8 @@ def efi_boot_env(request, u_boot_config):
                    shell=True)
 
         # Copy image
-        check_call('cp %s %s' % (HELLO_PATH, mnt_point), shell=True)
+        check_call('cp %s/lib/efi_loader/helloworld.efi %s' %
+                   (u_boot_config.build_dir, mnt_point), shell=True)
 
         # Sign image
         check_call('cd %s; sbsign --key db.key --cert db.crt helloworld.efi'
diff --git a/test/py/tests/test_efi_secboot/defs.py b/test/py/tests/test_efi_secboot/defs.py
index ba6b9f391e60..14891fcd3a00 100644
--- a/test/py/tests/test_efi_secboot/defs.py
+++ b/test/py/tests/test_efi_secboot/defs.py
@@ -1,14 +1,8 @@
 # SPDX-License-Identifier:      GPL-2.0+
 
-# Disk image name
-EFI_SECBOOT_IMAGE_NAME = 'test_efi_secboot.img'
-
 # Owner guid
 GUID = '11111111-2222-3333-4444-123456789abc'
 
 # v1.5.1 or earlier of efitools has a bug in sha256 calculation, and
 # you need build a newer version on your own.
 EFITOOLS_PATH = ''
-
-# Hello World application for sandbox
-HELLO_PATH = ''
-- 
2.27.0

  parent reply	other threads:[~2020-07-21 10:35 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-21 10:35 [PATCH v5 0/8] efi_loader: secure boot: support intermediate certificates in signature AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 1/8] lib: crypto: add public_key_verify_signature() AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 2/8] lib: crypto: enable x509_check_for_self_signed() AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 3/8] lib: crypto: import pkcs7_verify.c from linux AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 4/8] lib: crypto: add pkcs7_digest() AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 5/8] lib: crypto: export and enhance pkcs7_verify_one() AKASHI Takahiro
2020-07-21 10:35 ` [PATCH v5 6/8] efi_loader: signature: rework for intermediate certificates support AKASHI Takahiro
2020-07-22 11:00   ` Heinrich Schuchardt
2020-07-29  2:49     ` AKASHI Takahiro
2020-07-21 10:35 ` AKASHI Takahiro [this message]
2020-07-21 10:35 ` [PATCH v5 8/8] test/py: efi_secboot: add test for intermediate certificates AKASHI Takahiro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200721103524.5956-8-takahiro.akashi@linaro.org \
    --to=takahiro.akashi@linaro.org \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.