From patchwork Fri Nov 19 04:36:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Art Nikpal X-Patchwork-Id: 1556895 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=FxEdTEV+; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4HwP6F0v54z9s1l for ; Fri, 19 Nov 2021 15:37:41 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C090582FD6; Fri, 19 Nov 2021 05:37:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="FxEdTEV+"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0D41F82FDC; Fri, 19 Nov 2021 05:37:26 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) (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 2ED3882FE1 for ; Fri, 19 Nov 2021 05:37:16 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=email2tema@gmail.com Received: by mail-pl1-x635.google.com with SMTP id n8so7186843plf.4 for ; Thu, 18 Nov 2021 20:37:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oWIQAurGs5E6Bydg2I0nNQODWE3G8Lo0ZmBrnUmi2Zo=; b=FxEdTEV+1Tgn/qvfBkrV8AD2d6JgIX2g3m6jugmEENjywmOqVNWiHkiR0/5o4FxioS ftBhNWmPbSGZYhT0G1915PY17aJ5iNen+T6yenBP16aHWiohLrmOvS50cDhUaDCa/oaB W4UGWSWmVMDLXO+7iFtqEL3cJg2bES/MLS+SdVRnJryS8nS6a+vwAelzY3qhvBKNZO0k Q9bPVRSPoJ9Cd36zBspC/tZlpB9l0fzwhFIdRc0ShqGXHV78yZrffhNOjelCMYRZpMvw GwGdDboGMZSPk1vw5ovpELtqitPzdy9dq28IlsSkCmaYRXWhgUiSquCUu17XrDg7F0TJ KygA== 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=oWIQAurGs5E6Bydg2I0nNQODWE3G8Lo0ZmBrnUmi2Zo=; b=fLwG2mxOLNyPKjImWc5Q4jtnxez2jk/p0QuRcQRWTU6aew2K/PDsYK1bAA05QdABXW GNZigQFZNatMsEtWGbZd/EXAknax+ZRYDyvSqSG5+n2cTQ4G4U9gfrII+fEI7kFsope3 B3OBXORwMVoqFbFENlNy7OtZZTkZXoMXehqIofEvHTyuH5Tzv4A1wr4BSP0ssr3DjgNl XD0l1Dw1qdtCmjupaTqGcO6ntiZiS8ExOIF5zog+emO9hLVjGoIpxYQHiQSnnxPZ7C2a 9Usj8hdbjnNWfgr1ybWJQ81EAvtkkMsLtekrumYytydi8kH9+HFaqRS0XFuK+kjIBwTx euzQ== X-Gm-Message-State: AOAM533Qiw50AUztnOmInrJ3D/2LB8vw7JO4iW2hnXHa5rvMLEqR8DEN YrspQQH/q/kAyqIW1EW4szs= X-Google-Smtp-Source: ABdhPJxWJ0AHQHebXbS5hxC3GgmQQaxZeCZVX2+g36aNvaw7YihpFx+kXMPNVXtNzxDgp55MMdFnJQ== X-Received: by 2002:a17:90b:1644:: with SMTP id il4mr1061528pjb.39.1637296634601; Thu, 18 Nov 2021 20:37:14 -0800 (PST) Received: from localhost.localdomain ([2409:8929:1a0b:9314:3a1e:44db:1de0:ce09]) by smtp.gmail.com with ESMTPSA id u23sm1113089pfl.185.2021.11.18.20.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 20:37:14 -0800 (PST) From: Artem Lapkin X-Google-Original-From: Artem Lapkin To: sjg@chromium.org Cc: trini@konsulko.com, marek.behun@nic.cz, narmstrong@baylibre.com, twarren@nvidia.com, andre.przywara@arm.com, u-boot@lists.denx.de, u-boot-amlogic@groups.io, christianshewitt@gmail.com, art@khadas.com, nick@khadas.com, gouwa@khadas.com Subject: [PATCH v2 2/2] test: env: deep resolve value testing Date: Fri, 19 Nov 2021 12:36:47 +0800 Message-Id: <20211119043647.1251416-3-art@khadas.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211119043647.1251416-1-art@khadas.com> References: <20211119043647.1251416-1-art@khadas.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.35 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 Add new tests for `setenv -r` options (setup env variable with additional resolving vars inside value). test.py -k test_env Signed-off-by: Artem Lapkin Reviewed-by: Simon Glass --- test/py/tests/test_env.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/py/tests/test_env.py b/test/py/tests/test_env.py index 9bed2f48d7..a2f02f6f67 100644 --- a/test/py/tests/test_env.py +++ b/test/py/tests/test_env.py @@ -201,6 +201,30 @@ def test_env_unset_non_existent(state_test_env): unset_var(state_test_env, var) validate_empty(state_test_env, var) +def test_env_resovle(state_test_env): + """Test deep resolve variable.""" + c = state_test_env.u_boot_console + c.run_command("setenv a hello; setenv b world; setenv c '${a} ${b}'") + assert c.run_command('printenv a') == 'a=hello' + assert c.run_command('printenv b') == 'b=world' + assert c.run_command('printenv c') == 'c=${a} ${b}' + c.run_command("setenv d '${c}'") + assert c.run_command('printenv d') == 'd=${c}' + c.run_command("setenv -r e '${a} ${b} ${c}'") + assert c.run_command('printenv e') == 'e=hello world hello world' + c.run_command("setenv not_exist; setenv -r e '${not_exist}OK'") + assert c.run_command('printenv e') == 'e=OK' + c.run_command("setenv a 'A${b}'; setenv b 'B${a}'") + assert c.run_command('printenv a') == 'a=A${b}' + c.run_command("setenv e ''") + assert c.run_command('printenv e') == 'e=' + c.run_command("setenv -r e '${b}'") + #assert c.run_command('printenv e') == 'e=BABABABABABABABABABABABABABABABAB${a}' + assert c.run_command('printenv e') != 'e=' + c.run_command("setenv -r e") + with c.disable_check('error_notification'): + assert c.run_command('printenv e') == '## Error: "e" not defined' + def test_env_set_non_existent(state_test_env): """Test set a non-existant variable."""