From patchwork Wed Nov 20 02:42:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Kerr X-Patchwork-Id: 1197780 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47HngV1GYzz9sPV for ; Wed, 20 Nov 2019 14:07:50 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=ozlabs.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="OHsgSPLs"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47HngT5ZwjzDqlS for ; Wed, 20 Nov 2019 14:07:49 +1100 (AEDT) X-Original-To: petitboot@lists.ozlabs.org Delivered-To: petitboot@lists.ozlabs.org Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47Hn9V2TxmzDqgs for ; Wed, 20 Nov 2019 13:45:18 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=ozlabs.org Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=ozlabs.org header.i=@ozlabs.org header.b="OHsgSPLs"; dkim-atps=neutral Received: by ozlabs.org (Postfix, from userid 1023) id 47Hn9V06hGz9sR4; Wed, 20 Nov 2019 13:45:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ozlabs.org; s=201707; t=1574217918; bh=7UB96DxNgw6+I+rFOsD4T5vwHtcCiDFb3BcJxvehi8E=; h=From:To:Subject:Date:In-Reply-To:References:From; b=OHsgSPLs85FnVEw27nwoSPJ/1b2gRnbRu/u2Wz+N4mKI2hVQGAKm5P/ZcLpj+JdQW IkLSlam5gQ3jgG08rhUoF376b1by/X4/2BKAC/oM3V55d4NjbCtVv2zKbbICmnmbPG VmqnDYPrSLn7UQUVXxy/RooqcD50BlxZ3NPU/JGonopWwIsouBtQfbBpwHsd5t4nFX Ts1TIm06Jbnfb7+yfbksQuauW4SenlCs/cBBTQ+HT3piuGIcuziFfDaqpzSY+IZ6rR f4CCmGYhs/ynXu4RESsXpC860gH6cFO7YpFR/uLFM6QYhuawHTqzKzV06fwsYV/Nf1 OjGrGxut+RKPg== From: Jeremy Kerr To: petitboot@lists.ozlabs.org Subject: [PATCH 03/14] discover/grub2: test for (ignored) --no-floppy argument Date: Wed, 20 Nov 2019 10:42:55 +0800 Message-Id: <20191120024306.16526-4-jk@ozlabs.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191120024306.16526-1-jk@ozlabs.org> References: <20191120024306.16526-1-jk@ozlabs.org> MIME-Version: 1.0 X-BeenThere: petitboot@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Petitboot bootloader development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: petitboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Petitboot" --no-floppy is used almost everywhere, so add it to the tests. The code will already ignore unknown arguments, but ensure that this works OK. Signed-off-by: Jeremy Kerr --- test/parser/test-grub2-search-args.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/parser/test-grub2-search-args.c b/test/parser/test-grub2-search-args.c index ffce853..0eb5762 100644 --- a/test/parser/test-grub2-search-args.c +++ b/test/parser/test-grub2-search-args.c @@ -9,8 +9,10 @@ search a search --set=v1 b search --set v2 c +search --set=v3 --no-floppy d +search --no-floppy --set=v4 e -menuentry $root$v1$v2 { +menuentry $root$v1$v2$v3$v4 { linux /vmlinux } @@ -29,5 +31,5 @@ void run_test(struct parser_test *test) check_boot_option_count(ctx, 1); opt = get_boot_option(ctx, 0); - check_name(opt, "abc"); + check_name(opt, "abcde"); }