From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CACA4C4338F for ; Tue, 27 Jul 2021 09:14:43 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2DD8361262 for ; Tue, 27 Jul 2021 09:14:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 2DD8361262 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 00B4083475; Tue, 27 Jul 2021 11:14:32 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="s9ixMZ+4"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5A45D83455; Tue, 27 Jul 2021 11:13:13 +0200 (CEST) Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id A786183454 for ; Tue, 27 Jul 2021 11:13:03 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pl1-x62f.google.com with SMTP id n10so15172169plf.4 for ; Tue, 27 Jul 2021 02:13:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6HIrPXIjVXjdkRV02nKK25HxwrHlFfbcW9p38hEGMe8=; b=s9ixMZ+4/L5gkkJmsVQnQjMNsnoYuJqYSmmnp5N4tm7bH0McK6FqNB5+odbssdOoBv 2Szn+Lxe/Vy7+VnFhAlkRvOX+owT1oC+Mcdva99zAG49REwHYWt8EY3HZWLCmrXR767C Q/GsvS/BIfFZiIPwlZmJPc6YqIPBzoWI8OZ0gNE8URiS2sO37oz98smfAp/g59ZyhGEU McIvasw3WjoelV8go3IMKVg79BXXikf50cnMFBRCAgm0gmerTZH6YQCizOxTEmBqIzyU 7DwHsZ15FNZyzNO1VSbqPN+el4fv0lSLmcC71tFtJI4p1zvXVUTdvwRRl+AKMVzkq023 6D+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6HIrPXIjVXjdkRV02nKK25HxwrHlFfbcW9p38hEGMe8=; b=WAuiPH5mLqWeC+MUxgYESfvUjgUmBMpv7TRzyH7oJG/viANO1NSBw1gNXkaZMMoXcy v6kO9y7gPB6Oyrl6J61L8Zr9uHBdM8//tmRMZ8f2eiuEq4Nxhi72m1fFGJztiTF4mFFU 2tV66VNbIVijExK9W/RLVsHc+FxqwlUuLoxw0E2KaRwpnGGpIeRNcOlLSuNVdK0+3So7 3nsGbsleWWeJDvHZkGRGUMXxzBfRyxK3ln0UG6G0BKfLSnGK38d8b5/lMqp0hPkgwggb vbEiw8gI7fRhc+yqKfaRpzdG28gk3LZBYmeYYtiyEaowRu/CIUDAT4wbPtm4pi3cQs2I aeWA== X-Gm-Message-State: AOAM533yrIf8vpPpM6me9Z0g8AAc6qosxSNbiv1RpqCx6//zU9Tg61Zz QditboJGk2ds8W3I6nLA7g8Slg== X-Google-Smtp-Source: ABdhPJyr6bUSMm0j2J5lU2rtpRYWN25bPPBGiXnzGi8zNSc78DlXRy4f3pGafOsUfMew7KY4rUAMyQ== X-Received: by 2002:a17:90b:189:: with SMTP id t9mr347134pjs.1.1627377181942; Tue, 27 Jul 2021 02:13:01 -0700 (PDT) Received: from localhost.localdomain (pdb6272ed.tkyea130.ap.so-net.ne.jp. [219.98.114.237]) by smtp.gmail.com with ESMTPSA id q13sm2008218pjq.10.2021.07.27.02.12.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jul 2021 02:13:01 -0700 (PDT) From: AKASHI Takahiro To: xypron.glpk@gmx.de, agraf@csgraf.de, trini@konsulko.com, sjg@chromium.org Cc: ilias.apalodimas@linaro.org, sughosh.ganu@linaro.org, masami.hiramatsu@linaro.org, u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v2 9/9] test/py: efi_capsule: align with the syntax change of mkeficapsule Date: Tue, 27 Jul 2021 18:10:54 +0900 Message-Id: <20210727091054.512050-10-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210727091054.512050-1-takahiro.akashi@linaro.org> References: <20210727091054.512050-1-takahiro.akashi@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean Modify command line arguments at mkeficapsule as the syntax was a bit modified in the previous commit. Signed-off-by: AKASHI Takahiro --- test/py/tests/test_efi_capsule/conftest.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/py/tests/test_efi_capsule/conftest.py b/test/py/tests/test_efi_capsule/conftest.py index 35cfa5513703..86ace308b3cb 100644 --- a/test/py/tests/test_efi_capsule/conftest.py +++ b/test/py/tests/test_efi_capsule/conftest.py @@ -66,10 +66,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) if capsule_auth_enabled: @@ -78,11 +78,11 @@ def efi_capsule_data(request, u_boot_config): (u_boot_config.source_dir, data_dir), shell=True) # firmware signed with proper key - check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --index 1 --monotonic-count 1 --private-key SIGNER.key --certificate SIGNER.crt Test03' % + check_call('cd %s; %s/tools/mkeficapsule --index 1 --monotonic-count 1 --private-key SIGNER.key --certificate SIGNER.crt --raw u-boot.bin.new Test03' % (data_dir, u_boot_config.build_dir), shell=True) # firmware signed with *mal* key - check_call('cd %s; %s/tools/mkeficapsule --raw u-boot.bin.new --index 1 --monotonic-count 1 --private-key SIGNER2.key --certificate SIGNER2.crt Test04' % + check_call('cd %s; %s/tools/mkeficapsule --index 1 --monotonic-count 1 --private-key SIGNER2.key --certificate SIGNER2.crt --raw u-boot.bin.new Test04' % (data_dir, u_boot_config.build_dir), shell=True) -- 2.31.0