Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B86BAC433F5 for ; Sun, 6 Feb 2022 18:41:31 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 518C383BFC; Sun, 6 Feb 2022 19:38:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="QAxsT6hq"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5924F83BBF; Sun, 6 Feb 2022 19:38:52 +0100 (CET) Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) (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 572F483C17 for ; Sun, 6 Feb 2022 19:37:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=francis.laniel@amarulasolutions.com Received: by mail-wr1-x436.google.com with SMTP id m5so3869417wrb.2 for ; Sun, 06 Feb 2022 10:37:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=dKNf8tRhkuMyLN6P6XvvIr34QLJH4AfPvy0IjfkcPE8=; b=QAxsT6hq9k+lgm9wxqbUMQey4MhFNvNSmRLiHpToeX1qS5Be4ksr1WcnC6eVWdytlH lTF2bSrX5IF3lU2A0uFj5XkrEDn+d4uubyB7aTnIdnnCJcnlbORWyxf5bYsG7wtYfPeY RGZZHvYciInHrfZuD3VNxgHJamBEuoIcnqEto= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=dKNf8tRhkuMyLN6P6XvvIr34QLJH4AfPvy0IjfkcPE8=; b=q0L3GL+aepgMtYC2iOqf/ureLD9ZTpxxR/z1Fqqa+HY8WhjXIgrWptu11w6OpGJmH1 e75CTujFTH2hHmmZzKMFV1PrX1Z9alycy91WtUvK98VjNW94pw0OiiTU1et8vO4uijxl A0RGyFLcrB/1dd8M6KRYzmW/4C9Kc8/USlYO5SCM+Z0JPbSaY2yQWCZz96tboeK/DQkA oucBJC7phK/tsPcC8sE4063Kd2x8ZfRyLOQoWcaKzZq2MBSbnKHtUgsRKMtKHjY5L93p K9evkWyj3piLrHZ3cTKVsQq8lnBVXuWwdRCuQ1vrORi3T357vdrOwqGR8mN+Qf3Dm8wP jmlQ== X-Gm-Message-State: AOAM530iZ69NNbnJ9qSPQ0qf5BOT9yQhHirzlTm1voor2pDBSgTv0Itt hb/70qk7/6OyTESwerDkp37WPuxY7ti0lg== X-Google-Smtp-Source: ABdhPJyQx7eWkObJiZGAEwx9+jOubEXe3CWJbcSA9uTQNkKBMELidnJSI3hEkVouw6pgHJ505KDjOA== X-Received: by 2002:adf:d1e9:: with SMTP id g9mr7110150wrd.645.1644172676941; Sun, 06 Feb 2022 10:37:56 -0800 (PST) Received: from pwmachine.home ([2a01:cb14:983:1f00:e5b3:218b:cb92:2549]) by smtp.gmail.com with ESMTPSA id ay29sm7095011wmb.38.2022.02.06.10.37.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 10:37:56 -0800 (PST) From: Francis Laniel To: u-boot@lists.denx.de Cc: Marek Behun , Michael Nazzareno Trimarchi , Simon Glass , Wolfgang Denk , Harald Seiler , Francis Laniel Subject: [RFC PATCH v2 21/21] test: hush: Fix loop tests for hush 2021 Date: Sun, 6 Feb 2022 19:37:17 +0100 Message-Id: <20220206183717.57446-22-francis.laniel@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220206183717.57446-1-francis.laniel@amarulasolutions.com> References: <20220206183717.57446-1-francis.laniel@amarulasolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean Modifies return code got from while loop as hush 2021 always returns 0 from while loop. Signed-off-by: Francis Laniel Reviewed-by: Simon Glass --- test/hush/loop.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/test/hush/loop.c b/test/hush/loop.c index 519c78ef7e..56aae719dc 100644 --- a/test/hush/loop.c +++ b/test/hush/loop.c @@ -20,7 +20,12 @@ static int hush_test_for(struct unit_test_state *uts) ut_assert_nextline("quux"); ut_assert_console_end(); +#if CONFIG_IS_ENABLED(HUSH_2021_PARSER) + /* Reset local variable. */ + ut_assertok(run_command("loop_i=", 0)); +#else /* HUSH_OLD_PARSER */ puts("Beware: this test set local variable loop_i and it cannot be unset!"); +#endif /* HUSH_OLD_PARSER */ return 0; } @@ -30,12 +35,27 @@ static int hush_test_while(struct unit_test_state *uts) { console_record_reset_enable(); +#if CONFIG_IS_ENABLED(HUSH_2021_PARSER) + /* + * Hush 2021 always returns 0 from while loop... + * You can see code snippet near this line to have a better + * understanding: + * debug_printf_exec(": while expr is false: breaking (exitcode:EXIT_SUCCESS)\n"); + */ + ut_assertok(run_command("while test -z \"$loop_foo\"; do echo bar; loop_foo=quux; done", 0)); +#else /* HUSH_OLD_PARSER */ /* Exit status is that of test, so 1 since test is false to quit the loop. */ ut_asserteq(1, run_command("while test -z \"$loop_foo\"; do echo bar; loop_foo=quux; done", 0)); +#endif /* HUSH_OLD_PARSER */ ut_assert_nextline("bar"); ut_assert_console_end(); +#if CONFIG_IS_ENABLED(HUSH_2021_PARSER) + /* Reset local variable. */ + ut_assertok(run_command("loop_foo=", 0)); +#else /* HUSH_OLD_PARSER */ puts("Beware: this test set local variable loop_foo and it cannot be unset!"); +#endif /* HUSH_OLD_PARSER */ return 0; } -- 2.25.1