From patchwork Wed May 27 23:53:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1299277 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::440; helo=mail-wr1-x440.google.com; envelope-from=swupdate+bncbcoztveauabbb472xp3akgqegl2xvai@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fishpost.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=T6OlJKUp; dkim-atps=neutral Received: from mail-wr1-x440.google.com (mail-wr1-x440.google.com [IPv6:2a00:1450:4864:20::440]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XSMX3WfMz9sRY for ; Thu, 28 May 2020 09:53:27 +1000 (AEST) Received: by mail-wr1-x440.google.com with SMTP id z8sf11775211wrp.7 for ; Wed, 27 May 2020 16:53:26 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1590623604; cv=pass; d=google.com; s=arc-20160816; b=VTxGzje9jK+lqAgY7wC/31V7Bndjba4bGc+hZBa7hkXNQFQFxWSHRHjfrck0cYXbiQ rUlkQSsOXP+Bp/iy26YTDmxqm991ZzoFMnzjbomPhh0B293cyRevDmwk2EFQLyNSMMi8 drhtQ6NlLZ3riD8xh3TM3PMXTSIhYxZB60tgIanZem8+LoP6sInkIhZjQjCuz974tWfX pwqMTh/3UFJ7V9vn6nPORoSn/ksvos/SVc7EP8dBXrGdQKSeCyE6ePJVWzl22pqYFKPk l3Z09hgR8KrWJTOSorVJP1fg0l/s4z4UwjfUAZilqEKvQXzSuAoD96ESAWgq1xzX8SSS 0Vyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=9DeIWUI4spcTuwpwDwPL/tlMRhlL2feu1o7ch7w68P8=; b=lCwp+AqIgTyeG+eZg3S/lPwBhwhC0vUfU1/PFi+rN8mUDGO545v4wlkR5jE2V547d1 CSQCWwX/SaiFRCNCmYY7EDw0O78gkhQhf1g0H5Rm8P/axPWtJow221ww6Y0ZJC7MkI+i 3oMUi65dx5UCic7DY0g3tIFuji9LajiPb9gyC1kVAw+raCOwBA/Ih/3e7E8mZQvRDYS0 CYeWqSBt1VfntFNcF2zTj/dPRySVortzewbrJZs4wX8GxaZW3kmybciVEmFaKa0mMolb bDJiZWM4gTq+dRgO/JaSVMFm2nluXcVnYnkdOjTQ9tmHRlWKjRk/aJFRWhKpjDvlmwoW ERzQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=zIcuQVaB; spf=neutral (google.com: 2a00:1450:4864:20::544 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9DeIWUI4spcTuwpwDwPL/tlMRhlL2feu1o7ch7w68P8=; b=T6OlJKUpiNT76y9VpSB9cTn5qiixZUHBOUiLLJk2cd2JDYBKdnye6bpCQFzqgbOj8V AaumXHXjY+wPyBcJ3rbaSZ+7I83c/YHGT5SmG7Vt9KmYkdOcSjBMdFojQpQEp88YbXYg Osxo/IEX//jgdC/JXZdIeVVErqzTCt1ARrHTVjG3sY3lYTQo3mgrO0d1o99rXGTj3svy tUNDREsHydJoMKKDjc26n4fdwtu/xloL79GAa8m9o6iFZueY8y9xjccCvcR0SqDBNyEt fv+WKn5AqUkqfzIR6y6LpMZXUYXWTT2yxnqWkpsj2AzMUmxegECKLXoIB4q3CYyUDvdH cL7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=9DeIWUI4spcTuwpwDwPL/tlMRhlL2feu1o7ch7w68P8=; b=mF1LVpfxmmFVMav8wrEo8Bl+vDoBk0+CddZ4q7pkpRlGM22v3UZbKt+sNvxWepRVf2 BNZCHRfWyTbPrwYlunIJhDJoOvc+r1E870l8+589Lkt4tfg2jf5GKLu97t5cBRjtreDw 1cog9W/Jb7xl+bgGmPPQvGmyp5R1aromo+FTay/iGwQwKugROgk9+lkghnNI6bg6fMP/ YDEyugsftRg3htUZRmz51cJ9aW7Qip/NkDZfUjl61udBFFeaqAiEO390d3aI9z9XEf0O MoGuXpkKDN9Av4bE/8u5azxrF230u/zBXD2fOqXGK1NDZKQAyINqr3GptEIW3qWHZreJ HWhA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM532cnB28W/7tiaG+sDR0qzKUPi0YaSpJ+en0KmFtZxu4ddz1MLSX 1hwEaQ7PZW2EDw45vNW0+Yw= X-Google-Smtp-Source: ABdhPJxM4TLySh665FSx35hqia0zPeOuw6eAZfXaQVwhDU7eZKMnmZvSVX3SsenQdKXQMkylSOnCrQ== X-Received: by 2002:a05:6000:12c4:: with SMTP id l4mr747751wrx.128.1590623603930; Wed, 27 May 2020 16:53:23 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a7b:c959:: with SMTP id i25ls83053wml.2.gmail; Wed, 27 May 2020 16:53:23 -0700 (PDT) X-Received: by 2002:a7b:c385:: with SMTP id s5mr552644wmj.121.1590623603307; Wed, 27 May 2020 16:53:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590623603; cv=none; d=google.com; s=arc-20160816; b=CvjA/6AdJ6oBpY88IcFlVuUDLtGALazoksjomxefbWnPeFccaoZQP8qPg3724CYcxV Ft2pjG+yxu/e2z7tYLgO9DcABf2Upg1CaCe+/kpzkyR2O4HOutVPxE1t/5pt93oGk17j MdJUAN+PLuwYPGELJzYUaJydzIwToUCgHQW8qHk5MGs/Gk78tdR0Lero0WKEdbIvQqkM 4iFI6R5ANADPokxvbpI2ku3NUpM/3ACOWlsLZEJqucZCKibz1W4oc/eWPf3IwJ28Lgho GUWfQUo2okQoe5d9g5kyRpOLu2WFXNBxM+yraYgcn0KnJ5RGcLxwecMX/W6FEizJR+hP R4jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=O+kaG5nKCp+9/mdA2oi0ZPZ00DW+7PTYTbm09IsL2rg=; b=JjIRNIYsRQTwkNFRhUqyXnRwF1vMI5GJylZKhlQUmUJIUo0h8mBGFOmZER+bqFMMV3 IIMaBJvmjzOzMZxrWB3xAF/OGhd8CEvaOzBLyYD7bPiW1caBcWDwBSIkL6IWlJHYLamz ObFvGr/C3iucqvegn7v+DN2I+EUY0oJj3RBiCZqmHW7wJI0wfGTY8OT9TZ5L5JmjkUw4 giKrA0TQEDz6LJvNY58cm+lgddtRA86kAL5KVQRB4q/d9n8ojAwyp/t40iZjQpVtjtcm SG82rZWnS9J/ntLTOXo5g2iy4syZvDwyQyxTHlblo7V9FUFezyf462N2Pyuq7DY/ss9I sm9w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=zIcuQVaB; spf=neutral (google.com: 2a00:1450:4864:20::544 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com. [2a00:1450:4864:20::544]) by gmr-mx.google.com with ESMTPS id q8si239453wra.2.2020.05.27.16.53.23 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 May 2020 16:53:23 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4864:20::544 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) client-ip=2a00:1450:4864:20::544; Received: by mail-ed1-x544.google.com with SMTP id be9so21721753edb.2 for ; Wed, 27 May 2020 16:53:23 -0700 (PDT) X-Received: by 2002:a50:8dc2:: with SMTP id s2mr560919edh.318.1590623602726; Wed, 27 May 2020 16:53:22 -0700 (PDT) Received: from thinkbage.fritz.box (p200300d06f3a080026b7d3c47ad71f46.dip0.t-ipconnect.de. [2003:d0:6f3a:800:26b7:d3c4:7ad7:1f46]) by smtp.gmail.com with ESMTPSA id fi9sm3981339ejb.5.2020.05.27.16.53.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 16:53:22 -0700 (PDT) From: Bastian Germann To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 1/3] acceptance-tests: libconfig and raw config Date: Thu, 28 May 2020 01:53:12 +0200 Message-Id: <20200527235314.16676-2-bastiangermann@fishpost.de> X-Mailer: git-send-email 2.27.0.rc0 In-Reply-To: <20200527235314.16676-1-bastiangermann@fishpost.de> References: <20200527235314.16676-1-bastiangermann@fishpost.de> MIME-Version: 1.0 X-Original-Sender: bastiangermann@fishpost.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=zIcuQVaB; spf=neutral (google.com: 2a00:1450:4864:20::544 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Two tests need CONFIG_RAW and CONFIG_LIBCONFIG. Add the missing conditions. Signed-off-by: Bastian Germann --- scripts/acceptance-tests/CheckImage.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/acceptance-tests/CheckImage.mk b/scripts/acceptance-tests/CheckImage.mk index bff7c24..795dba6 100644 --- a/scripts/acceptance-tests/CheckImage.mk +++ b/scripts/acceptance-tests/CheckImage.mk @@ -48,8 +48,8 @@ quiet_cmd_download = GET $@ # tests-y += FileNotFoundTest tests-y += CrapFileTest -tests-y += ImgNameErrorTest -tests-$(CONFIG_LIBCONFIG) += ValidImageTest +tests-$(CONFIG_LIBCONFIG) += $(if $(CONFIG_RAW), ImgNameErrorTest) +tests-$(CONFIG_LIBCONFIG) += $(if $(CONFIG_RAW), ValidImageTest) tests-y += InvOptsNoImg tests-$(CONFIG_MONGOOSE) += InvOptsCheckWithWeb tests-$(CONFIG_SURICATTA) += InvOptsCheckWithSur From patchwork Wed May 27 23:53:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1299276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::138; helo=mail-lf1-x138.google.com; envelope-from=swupdate+bncbcoztveauabbb5p2xp3akgqewkahf2a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fishpost.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=XL/iI8GK; dkim-atps=neutral Received: from mail-lf1-x138.google.com (mail-lf1-x138.google.com [IPv6:2a00:1450:4864:20::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XSMX737jz9sSW for ; Thu, 28 May 2020 09:53:28 +1000 (AEST) Received: by mail-lf1-x138.google.com with SMTP id l1sf2087677lfj.3 for ; Wed, 27 May 2020 16:53:28 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1590623605; cv=pass; d=google.com; s=arc-20160816; b=sVHGFpHsP40XZnzl9zT6Ak6dxK8IDtmhJDYLy3e+Gjk3yexEJrN955mSOfc47Uue8E urp/G6VSJS2AxoxONy7EAtqZjN6wL/mO+6KwBkCktkpVdXx4+iRjunnOQuVSqt4LYbqk IwMDaql+NuevKtdSk52QRRTZ6pqfA9fFghoJrlGaix0LV3L7BtlAOCIU/uo139mAMl8f LemX/meAUfjqZjNaA3JxE/KNoER58rwqHVkAoVNvJgmN5SaF+ss6GAaICQc8yaSvSCjh pNvUJ55z8e/SUL3b9zW3ODcbbLn03nzJn+/QudloBOXoDGipvdxYADa+h+jPR0yzfWXu NOcw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=95S8LNd5EN726qJBBdozgayFp/K0S9ANUBEBH3hGesU=; b=CkwN1Qfv+E7u/sBbCfyKAclEL2ydkPD23/2MaCTvzJfAQBzUCU5mpwpZoWVsuof8Mc WUACdnv3KxJLArUeGbXFanpRm4gg4DgyCBghko5H2g4jtv/K6t6PstflfkP7VUUhEYub 0Y+r9naRwG6VdcQOddtp/VQz14z7iGAoJd8VsqKqm8IB4UnAY/eL7CKabtQ0we+DEthF Fjt6OcIQwiqt1tL5jItp9XS6ChLE5Fh/31Fn6ZL5+EdlaD3Xz2njeoVZUpPvNrrCt68q 1gRd43R5JD5Q9sUWOQ79F8P1qakbcvwPEFgM0DRB2uovgpK0aFYXoeuN06x4/B4VaPIf ZROA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=XLdWkfLG; spf=neutral (google.com: 2a00:1450:4864:20::541 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=95S8LNd5EN726qJBBdozgayFp/K0S9ANUBEBH3hGesU=; b=XL/iI8GKS+9LDMD1HfrsGxhWEO6pxJyqkYt/sJSrTBWVV7nBV+cIOrOdM4iYd0PTVl aEr+AfTCW0IFXJQv1yQlNRn0kLBZAsINlzu+1PQuaayY75j7Uka5+yinFRTgHU1BPaI1 /BYtfio3BMLQAiIKDFXDEoSUrlUJFarVHY9QSWTOVJhOQTN2aiPJxgIsbwaQqli4ygT0 FFZLrsx6gIwmLhD9cm7yA2sWpgJYzxovVtWoqFwDzDQyU3N4tWvWdQC7WDKnt0Xj3eSl JvjvKg85FBYSCQKt4QcKLU0KdoM3UDdZGeflhv5Imjakt0mgt7oHyqYAfMDw0zKOFw1/ sfmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=95S8LNd5EN726qJBBdozgayFp/K0S9ANUBEBH3hGesU=; b=fZEzcnUjGIm3A2+O3p5/djNkl+BEHkupr5eixJbYqz5UNdst5b5/ljfoWu6xEoirj5 ICyxJkx8MgU2xLnd2QEXVVpE35tcsH9JrcAg+h4FNU7tBKd4/2sT8NlZA8X+W2NB1GJn JhfhTl7QqZ56lHWUSXZU92xeDcsi/g16B/NwUHGQPhyhZmoVUt4XoGEcCiR2yerB2vHW Tot7jQViEwOJBDAV5HPxdA5vGvfgUAMj4+X2+o38Q46jIWYkizUSm0QCOdMAPpafJjA2 8QPY5LYA1JW9fy8pWcqvZxwsG4SERQaimlT1e7OTFBvjdST9k6WfAnk7Gl7sdxpx5Pks GjyA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM531X9Az6qK0Ppp+8ToJ1u7fy5vU1bcqh4ZjlGHrYGdga0qDA6/s4 cwVIsXzcVl+860IscHEjBd4= X-Google-Smtp-Source: ABdhPJzKRz1ClNXSCuNWwB1kHocjYvVsFm6UawnETocJ6sqCS97KDgvIdVNYTihSXZ+QrQVDD4xb3Q== X-Received: by 2002:a05:651c:1208:: with SMTP id i8mr86883lja.103.1590623605540; Wed, 27 May 2020 16:53:25 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9758:: with SMTP id f24ls111281ljj.7.gmail; Wed, 27 May 2020 16:53:24 -0700 (PDT) X-Received: by 2002:a2e:9b4d:: with SMTP id o13mr82822ljj.363.1590623604677; Wed, 27 May 2020 16:53:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590623604; cv=none; d=google.com; s=arc-20160816; b=MRxL/8tJ8aVx7qEinX3J88MSuMfYkfbxUuX02zTj28zmBHh1A/A63nyZ/y0H5FFZi6 SifKeuKcZzQzbgAhF7LVv1AalTWlvKfg3Uylz1Ru40wGOCEEMB8x9NCw1Em+HU+Uh0kK qfC8Qi2QtArz/GXD43aUvfeB6Qw0yIzGWrENtnfOe6B8l4RSmD6e9dNriafXxGkNoES1 Nql6odlJIZqzjSokUosYL7Yof4qBal0SDH0XZTobk8WarOKVgnbnHryg81sZ/EwJZX2M k/Jow8d6EsYeWvIHnCsgC70/9IcrKxwWXbVe2FWvcyLeFKWCcvmRl3FrF/7SEC0pLAjc A6jA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=jM0orT8orGmJWzVkI06mYDwCSRMrfpxNU5XBKQKc7bM=; b=Qna2Ggf1l4Mv7TMYj8CRhe0GMomslpWh3inqf8L2OprT1k05pbolmdXPZrg0F981Ih hMDt16ZJUmFXqUxBG6D5V8XY4urh6DHGcV2ZtYJssIyk1dqGpRkhmAdw93v1yIUw4pkS JTzeCfSHkXzqk5pI2UI5eftbSrSmOZaEExK3+CTIdzg8Mt+fyXhB//vKj/t/Y5/vyPOZ qb94DjeLkgX9y6xpMSwIFodScmcCBFrFZxA/IcxKpJo1IP/Qqm44gp1Ja1tuLYbU2IvE W5cW/syBr8RxSRaITRtMT5Er6YRUaaJxheenHb8RIzHXeZDRfmNqck8AWmkUMh3o396M 5tQw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=XLdWkfLG; spf=neutral (google.com: 2a00:1450:4864:20::541 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Received: from mail-ed1-x541.google.com (mail-ed1-x541.google.com. [2a00:1450:4864:20::541]) by gmr-mx.google.com with ESMTPS id e7si242088ljo.2.2020.05.27.16.53.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 May 2020 16:53:24 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4864:20::541 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) client-ip=2a00:1450:4864:20::541; Received: by mail-ed1-x541.google.com with SMTP id m21so5180019eds.13 for ; Wed, 27 May 2020 16:53:24 -0700 (PDT) X-Received: by 2002:a05:6402:1775:: with SMTP id da21mr526470edb.271.1590623603784; Wed, 27 May 2020 16:53:23 -0700 (PDT) Received: from thinkbage.fritz.box (p200300d06f3a080026b7d3c47ad71f46.dip0.t-ipconnect.de. [2003:d0:6f3a:800:26b7:d3c4:7ad7:1f46]) by smtp.gmail.com with ESMTPSA id fi9sm3981339ejb.5.2020.05.27.16.53.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 16:53:23 -0700 (PDT) From: Bastian Germann To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 2/3] acceptance-tests: signatures work only with CMS Date: Thu, 28 May 2020 01:53:13 +0200 Message-Id: <20200527235314.16676-3-bastiangermann@fishpost.de> X-Mailer: git-send-email 2.27.0.rc0 In-Reply-To: <20200527235314.16676-1-bastiangermann@fishpost.de> References: <20200527235314.16676-1-bastiangermann@fishpost.de> MIME-Version: 1.0 X-Original-Sender: bastiangermann@fishpost.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=XLdWkfLG; spf=neutral (google.com: 2a00:1450:4864:20::541 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Instead of any CONFIG_SIGNED_IMAGES implementation, the acceptance-tests only work with CONFIG_SIGALG_CMS. Replace the existing occurences. ValidImageTest works for unsigned scenarios, so add a condition to deal with both cases. Signed-off-by: Bastian Germann --- scripts/acceptance-tests/CheckImage.mk | 28 ++++++++++++++------------ 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/scripts/acceptance-tests/CheckImage.mk b/scripts/acceptance-tests/CheckImage.mk index 795dba6..02e0e6c 100644 --- a/scripts/acceptance-tests/CheckImage.mk +++ b/scripts/acceptance-tests/CheckImage.mk @@ -18,7 +18,7 @@ # # test commands for --check command-line option # -SWU_CHECK_BASE = ./swupdate -l 5 -c $(if $(CONFIG_SIGNED_IMAGES),-k $(obj)/cacert.pem) $(if $(strip $(filter %.cfg, $^)), -f $(filter %.cfg, $^)) +SWU_CHECK_BASE = ./swupdate -l 5 -c $(if $(CONFIG_SIGALG_CMS),-k $(obj)/cacert.pem) $(if $(strip $(filter %.cfg, $^)), -f $(filter %.cfg, $^)) SWU_CHECK = $(SWU_CHECK_BASE) $(if $(CONFIG_HW_COMPATIBILITY),-H test:1) $(if $(strip $(filter-out FORCE,$<)),-i $<) $(if $(strip $(KBUILD_VERBOSE:0=)),,>/dev/null 2>&1) quiet_cmd_swu_check_assert_false = RUN $@ @@ -49,25 +49,27 @@ quiet_cmd_download = GET $@ tests-y += FileNotFoundTest tests-y += CrapFileTest tests-$(CONFIG_LIBCONFIG) += $(if $(CONFIG_RAW), ImgNameErrorTest) +ifeq ($(CONFIG_SIGNED_IMAGES),$(CONFIG_SIGALG_CMS)) tests-$(CONFIG_LIBCONFIG) += $(if $(CONFIG_RAW), ValidImageTest) +endif tests-y += InvOptsNoImg tests-$(CONFIG_MONGOOSE) += InvOptsCheckWithWeb tests-$(CONFIG_SURICATTA) += InvOptsCheckWithSur -tests-$(CONFIG_SIGNED_IMAGES) += InvSigNameCheck -tests-$(CONFIG_SIGNED_IMAGES) += ValidSigNameCheck +tests-$(CONFIG_SIGALG_CMS) += InvSigNameCheck +tests-$(CONFIG_SIGALG_CMS) += ValidSigNameCheck # # file not found test # PHONY += FileNotFoundTest FileNotFound.swu -FileNotFoundTest: FileNotFound.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +FileNotFoundTest: FileNotFound.swu FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) # # corrupt file test # PHONY += CrapFileTest -CrapFileTest: $(obj)/CrapFile.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +CrapFileTest: $(obj)/CrapFile.swu FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) clean-files += CrapFile.swu @@ -79,7 +81,7 @@ $(obj)/CrapFile.swu: # test of update file with image name in sw-description missmatch # PHONY += ImgNameErrorTest -ImgNameErrorTest: $(obj)/ImgNameError.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +ImgNameErrorTest: $(obj)/ImgNameError.swu FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) %/hello.txt: @@ -111,7 +113,7 @@ software =\n\ }\n\ " > $@ -with_sig = $1 $(if $(CONFIG_SIGNED_IMAGES),$(addsuffix .sig, $1)) +with_sig = $1 $(if $(CONFIG_SIGALG_CMS),$(addsuffix .sig, $1)) clean-files += ImgNameError.swu $(obj)/ImgNameError.swu: $(call with_sig, $(obj)/ImgNameError/sw-description) $(obj)/ImgNameError/hello.txt @@ -121,7 +123,7 @@ $(obj)/ImgNameError.swu: $(call with_sig, $(obj)/ImgNameError/sw-description) $( # Test of a valid *.swu file # PHONY += ValidImageTest -ValidImageTest: $(obj)/ValidImage.swu FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +ValidImageTest: $(obj)/ValidImage.swu FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_true) clean-dirs += ValidImage @@ -158,21 +160,21 @@ $(obj)/ValidImage.swu: $(call with_sig, $(obj)/ValidImage/sw-description) $(obj) # invalid option test, no image given # PHONY += InvOptsNoImg -InvOptsNoImg: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +InvOptsNoImg: FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) # # invalid option test, web server with check # PHONY += InvOptsCheckWithWeb -InvOptsCheckWithWeb: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +InvOptsCheckWithWeb: FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_inv_websrv) # # invalid option test, suricatta with check # PHONY += InvOptsCheckWithSur -InvOptsCheckWithSur: FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +InvOptsCheckWithSur: FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_inv_suricatta) clean-files += signer.pem cacert.pem @@ -187,7 +189,7 @@ $(obj)/signer.pem $(obj)/cacert.pem: # invalid signer name # PHONY += InvSigNameCheck -InvSigNameCheck: $(obj)/ValidImage.swu $(obj)/InvSigNameCheck.cfg FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +InvSigNameCheck: $(obj)/ValidImage.swu $(obj)/InvSigNameCheck.cfg FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_false) clean-files += InvSigNameCheck.cfg @@ -202,7 +204,7 @@ globals: {\n\ # valid signer name # PHONY += ValidSigNameCheck -ValidSigNameCheck: $(obj)/ValidImage.swu $(obj)/ValidSigNameCheck.cfg FORCE $(if $(CONFIG_SIGNED_IMAGES), $(obj)/cacert.pem) +ValidSigNameCheck: $(obj)/ValidImage.swu $(obj)/ValidSigNameCheck.cfg FORCE $(if $(CONFIG_SIGALG_CMS), $(obj)/cacert.pem) $(call cmd,swu_check_assert_true) clean-files += ValidSigNameCheck.cfg From patchwork Wed May 27 23:53:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bastian Germann X-Patchwork-Id: 1299275 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:4864:20::13c; helo=mail-lf1-x13c.google.com; envelope-from=swupdate+bncbcoztveauabbb5p2xp3akgqewkahf2a@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=fishpost.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.a=rsa-sha256 header.s=20161025 header.b=K73XkPP7; dkim-atps=neutral Received: from mail-lf1-x13c.google.com (mail-lf1-x13c.google.com [IPv6:2a00:1450:4864:20::13c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49XSMY46rFz9sSc for ; Thu, 28 May 2020 09:53:29 +1000 (AEST) Received: by mail-lf1-x13c.google.com with SMTP id x27sf5915239lfq.14 for ; Wed, 27 May 2020 16:53:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1590623606; cv=pass; d=google.com; s=arc-20160816; b=SD+c7FoJF3GjTkBJmgNpPavPMWjz9uLe67HL3VRejgp+/w38hdRq3NdhMXMhrGMWMj 9Tm/aLEx7RvFtHlVNeXGMqw4sX7BtoWcMw8Hb4PkZeh7jYKyFnzuD1eiz+QWv0z3FiFL JSQeDx2QDRD2gVxYPPEPHIKTJQ7qL3/V8RJ5dR030fZv06mPpGRcSPm2Dds8aa78tUMo XJLHFvydKkk4xQeI1kgy8AtJnOEpNYkJqxp6NodgyG2/ifTG7vPIRfPEUOK6b54YOQuW 7LKo4QooWPkIPE6xDyQHopFE/CfOF17Nn8Fs0ICJ3X9e5TGIZhhBSrbA7OSsMEJaSebi zQBw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=0hTeP28qDf6ISQTqFs0yFmnA9VKe716qTqtx7EECTrw=; b=nZYlK65/8mgj5Mxokjo4AAIqcDFyCFYn3LQ0XaC67MRIL5WoLZguJaQtC15fbTSXck cZF88Ggo67cj+1tUGUYU3Nc76BK2tkDhaUy0pqUmz1w/z3/1nNyHz8VZ/bAcZiXEECMk c64SRj29IBuosJG0ZL8Y6s4KGcwmr/yC52U41aqV1TpshCj9H0m5oE9/9Z3co09dPVNp pVI6noRTcFEZog0jPCGSS2xlORnjO3uEmwhopJmrgvugK0xnEdptoWER5ImTnNaDLTde rUKiT7jZAo/J8M8nSUD66+IZWfa2h/j9EQdvxcqpo6ZUJRX9oHPP7b88fgfYkVjQKAmw IbkA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=RtqR21Ax; spf=neutral (google.com: 2a00:1450:4864:20::543 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0hTeP28qDf6ISQTqFs0yFmnA9VKe716qTqtx7EECTrw=; b=K73XkPP7yxqtUJr01NCwZsCKtDXT6KRwvonoaqQzzusHO08XviNKyyTt4Hcd5mHjry KAXDt6IJTtYdVJzHVQopidHHKJS+U8+bRBTEuPB61TZYFr4qdY/sQYODhCkc/WXYNe4J jnhemA3T8SWanRY8YBsYIATFpTgnnnSe/toXufaXnUtg1voJQASCCLPaeZ2BGQ8WUeGt LaPq5dOvixQFx98ebU+V2uoaUWO3Byl5Pe9M1ZvynWHaJL86FqnL4MmBATNsme7pwbZV aoNgL8MJNVpUE+xoq+VM9MK9bJqWvMZVdZByZ9f3O4YKwm+Lr8FABn3Q/DF8srh8w8HT K1MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=0hTeP28qDf6ISQTqFs0yFmnA9VKe716qTqtx7EECTrw=; b=XcG9fQRj1fDFwOBDZMmrmbHWWVMbh8E7nizs0yIUHS58z+OeBCOoeM7YI7bYSevS+9 DvbVp390PRASRbSXfQXvFCju6JzGc6VgJekk9URRBWLqLpsnw9SUEfdfBbrvvbOwvCYg uJLKbM+IbyVK4nhnNnDRgoqw80wqCZvJObM0s4uwFbVRk0ZDRhzR4/8CuCciBaF+tgCP ZJyvbrVq+PkYxBMniqhRJpEt1hsfLlaW43QwTaV20eu8VFSAf81cauBJ7HwzHcpe0oKd 2o8e2W2MC1iZjZ3eV5asKS5+C7/afRlx2ye0eOgIFDpKwh+PTmsGJbwvHafEtUNHYIfM ROQA== Sender: swupdate@googlegroups.com X-Gm-Message-State: AOAM533zF0S304pdDwF2kzroqHROfCvgxb8dplstvYVuOc+gxIGZD9Oc EzBpUlZzUn2MOdA5lzPG9Ts= X-Google-Smtp-Source: ABdhPJwSwLRrJ6CrRbSTlbLcmCJWhjO7WORy7+5PNNw2Fuv1jxFzkThVAy279gZQtvp/nnF+Q6rUSg== X-Received: by 2002:a2e:a544:: with SMTP id e4mr101031ljn.264.1590623606247; Wed, 27 May 2020 16:53:26 -0700 (PDT) X-BeenThere: swupdate@googlegroups.com Received: by 2002:a2e:9042:: with SMTP id n2ls114518ljg.4.gmail; Wed, 27 May 2020 16:53:25 -0700 (PDT) X-Received: by 2002:a05:651c:303:: with SMTP id a3mr92625ljp.414.1590623605461; Wed, 27 May 2020 16:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590623605; cv=none; d=google.com; s=arc-20160816; b=gwJ8b1EbP4IjhWcawioslbTR3eZa8bkHKZwwNuZtlAnWFzxCPlL06rDmWckgulVIYc sXaPlSU6kdn5ktgr+Q6AnYQEdfa422fAwwEzS06JtQjAd0sfkFZweUc/p+bSj/WY3/2T GACa5hWstGuAA203D68V3Roivc8hTrYwkIAoH27P/MqGV/g9MpblsAjHEZDa25e3rYny js/5uZGpstfGVQNW8R8awo+i6/fcME59B8q2ln7QvTRyDWUxABoMhchVDeH208aZtJCx vNN8shpWttauZuFbvWjeMYlO0JWXOs1kDM4bRSnQ/4FXx0ujAsCfj/p4bNfFBDWWgypU 0APg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=d0IrIhZkkq6h9uGSaX+JhTC+8dLqon9aS+LHBkD8miI=; b=aIxx97N6uBzjtZ1OaDZ3YPTL8K3XJn1X9LIX/5C4Pe+z0W1xIBF0CHFexTrqFu560p beiz1k8O0pb9gNq9x1M3E5u9dJFZxRAeM9y1DVWKCT0Z4NpKL/m7S/OBdLjgBPb8QjBi J8Dfiru5unGpiTeVq5aFZ0F4b3qlSNHPePi0pL/XydBMbo4nWbd4u9Y+4T+LPvvgBHxc yC4M552yMn7bEVbJ2cuIXMZ6TW5KSUAU2+7sCARFtYrBBz3/87sdqBV6JoZlPTHlyOO8 NRJtWO3BjS7EILiP0DJpT6T+KWWfqYbAK/470ktK2Uz2nOIG0G2gDGdV0v9fV9goMQui j/nQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=RtqR21Ax; spf=neutral (google.com: 2a00:1450:4864:20::543 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com. [2a00:1450:4864:20::543]) by gmr-mx.google.com with ESMTPS id e7si242089ljo.2.2020.05.27.16.53.25 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 27 May 2020 16:53:25 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4864:20::543 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) client-ip=2a00:1450:4864:20::543; Received: by mail-ed1-x543.google.com with SMTP id g9so21695433edr.8 for ; Wed, 27 May 2020 16:53:25 -0700 (PDT) X-Received: by 2002:a05:6402:3044:: with SMTP id bu4mr561538edb.342.1590623604719; Wed, 27 May 2020 16:53:24 -0700 (PDT) Received: from thinkbage.fritz.box (p200300d06f3a080026b7d3c47ad71f46.dip0.t-ipconnect.de. [2003:d0:6f3a:800:26b7:d3c4:7ad7:1f46]) by smtp.gmail.com with ESMTPSA id fi9sm3981339ejb.5.2020.05.27.16.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 May 2020 16:53:24 -0700 (PDT) From: Bastian Germann To: swupdate@googlegroups.com Cc: Bastian Germann Subject: [swupdate] [PATCH 3/3] Makefile: fix the tests target Date: Thu, 28 May 2020 01:53:14 +0200 Message-Id: <20200527235314.16676-4-bastiangermann@fishpost.de> X-Mailer: git-send-email 2.27.0.rc0 In-Reply-To: <20200527235314.16676-1-bastiangermann@fishpost.de> References: <20200527235314.16676-1-bastiangermann@fishpost.de> MIME-Version: 1.0 X-Original-Sender: bastiangermann@fishpost.de X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@fishpost-de.20150623.gappssmtp.com header.s=20150623 header.b=RtqR21Ax; spf=neutral (google.com: 2a00:1450:4864:20::543 is neither permitted nor denied by best guess record for domain of bastiangermann@fishpost.de) smtp.mailfrom=bastiangermann@fishpost.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , Clean the tests target from cruft. Signed-off-by: Bastian Germann --- Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7731522..b4da3d6 100644 --- a/Makefile +++ b/Makefile @@ -465,10 +465,8 @@ install: all install -m 0755 ${lua_swupdate} $(DESTDIR)/${LIBDIR}/lua/$(LUAVER); \ fi -PHONY += run-tests -tests: \ - acceptance-tests \ - corelib-tests +PHONY += tests +tests: acceptance-tests PHONY += acceptance-tests acceptance-tests: FORCE