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=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 CAAB4C433B4 for ; Fri, 21 May 2021 06:34:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4114613B6 for ; Fri, 21 May 2021 06:34:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231840AbhEUGgU (ORCPT ); Fri, 21 May 2021 02:36:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:55516 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232764AbhEUGgR (ORCPT ); Fri, 21 May 2021 02:36:17 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8109F613C4; Fri, 21 May 2021 06:34:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621578895; bh=/AkyYMBWlTA6G5Cm36+jQhlcRYLFU3nwA5Jw1zR2vbA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kfZiursP0D5XPn6TvWqYVSfkrQVNszTxst4/RLY+aOR6mPNS3j8vBkNbI/DMJ1hJy 4NxZIOUlTrWUJbGDrgaLzVv/aTyWs0e0R84Ybz/eDqqE3mGKj4Iuzz7ZHVWKeKGqz6 PkitFfQ2D0f7FPNZYbLu5LBDJG6y9vGvRpuOZydNyxkvn0e85WMR3eXLHdE86Rz7aK h5Goam0YrshA3YsYYsb/FMFeVSnLxlveXdTllG59t6Ws1zt51hKlaMqAcLvmvsYA/3 b4TwGmRrP/d3BL6UaXs61QUoSRKzFCVhmXBwaDGOUTjrrQbGBSzaqMXKzda4zuiOpt REEzIFE6RgkQQ== From: Masami Hiramatsu To: Steven Rostedt Cc: LKML , Ingo Molnar , Devin Moore Subject: [PATCH v2 3/4] tools/bootconfig: Support mixed value and subkey test cases Date: Fri, 21 May 2021 15:34:52 +0900 Message-Id: <162157889223.78209.16105784168655179243.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <162157886618.78209.11141970623539574861.stgit@devnote2> References: <162157886618.78209.11141970623539574861.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update test case to support mixed value and subkey on a key. Signed-off-by: Masami Hiramatsu --- tools/bootconfig/samples/bad-mixed-kv1.bconf | 3 --- tools/bootconfig/samples/bad-mixed-kv2.bconf | 3 --- tools/bootconfig/samples/bad-override.bconf | 3 --- tools/bootconfig/samples/bad-override2.bconf | 3 --- tools/bootconfig/samples/good-mixed-append.bconf | 4 ++++ tools/bootconfig/samples/good-mixed-kv1.bconf | 3 +++ tools/bootconfig/samples/good-mixed-kv2.bconf | 3 +++ tools/bootconfig/samples/good-mixed-kv3.bconf | 6 ++++++ tools/bootconfig/samples/good-mixed-override.bconf | 4 ++++ 9 files changed, 20 insertions(+), 12 deletions(-) delete mode 100644 tools/bootconfig/samples/bad-mixed-kv1.bconf delete mode 100644 tools/bootconfig/samples/bad-mixed-kv2.bconf delete mode 100644 tools/bootconfig/samples/bad-override.bconf delete mode 100644 tools/bootconfig/samples/bad-override2.bconf create mode 100644 tools/bootconfig/samples/good-mixed-append.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv1.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv2.bconf create mode 100644 tools/bootconfig/samples/good-mixed-kv3.bconf create mode 100644 tools/bootconfig/samples/good-mixed-override.bconf diff --git a/tools/bootconfig/samples/bad-mixed-kv1.bconf b/tools/bootconfig/samples/bad-mixed-kv1.bconf deleted file mode 100644 index 1761547dd05c..000000000000 --- a/tools/bootconfig/samples/bad-mixed-kv1.bconf +++ /dev/null @@ -1,3 +0,0 @@ -# value -> subkey pattern -key = value -key.subkey = another-value diff --git a/tools/bootconfig/samples/bad-mixed-kv2.bconf b/tools/bootconfig/samples/bad-mixed-kv2.bconf deleted file mode 100644 index 6b32e0c3878c..000000000000 --- a/tools/bootconfig/samples/bad-mixed-kv2.bconf +++ /dev/null @@ -1,3 +0,0 @@ -# subkey -> value pattern -key.subkey = value -key = another-value diff --git a/tools/bootconfig/samples/bad-override.bconf b/tools/bootconfig/samples/bad-override.bconf deleted file mode 100644 index fde6c561512e..000000000000 --- a/tools/bootconfig/samples/bad-override.bconf +++ /dev/null @@ -1,3 +0,0 @@ -key.subkey = value -# We can not override pre-defined subkeys with value -key := value diff --git a/tools/bootconfig/samples/bad-override2.bconf b/tools/bootconfig/samples/bad-override2.bconf deleted file mode 100644 index 688587cb023c..000000000000 --- a/tools/bootconfig/samples/bad-override2.bconf +++ /dev/null @@ -1,3 +0,0 @@ -key = value -# We can not override pre-defined value with subkey -key.subkey := value diff --git a/tools/bootconfig/samples/good-mixed-append.bconf b/tools/bootconfig/samples/good-mixed-append.bconf new file mode 100644 index 000000000000..b99a089a05f5 --- /dev/null +++ b/tools/bootconfig/samples/good-mixed-append.bconf @@ -0,0 +1,4 @@ +key = foo +keyx.subkey = value +key += bar + diff --git a/tools/bootconfig/samples/good-mixed-kv1.bconf b/tools/bootconfig/samples/good-mixed-kv1.bconf new file mode 100644 index 000000000000..1761547dd05c --- /dev/null +++ b/tools/bootconfig/samples/good-mixed-kv1.bconf @@ -0,0 +1,3 @@ +# value -> subkey pattern +key = value +key.subkey = another-value diff --git a/tools/bootconfig/samples/good-mixed-kv2.bconf b/tools/bootconfig/samples/good-mixed-kv2.bconf new file mode 100644 index 000000000000..6b32e0c3878c --- /dev/null +++ b/tools/bootconfig/samples/good-mixed-kv2.bconf @@ -0,0 +1,3 @@ +# subkey -> value pattern +key.subkey = value +key = another-value diff --git a/tools/bootconfig/samples/good-mixed-kv3.bconf b/tools/bootconfig/samples/good-mixed-kv3.bconf new file mode 100644 index 000000000000..2ce2b02224b8 --- /dev/null +++ b/tools/bootconfig/samples/good-mixed-kv3.bconf @@ -0,0 +1,6 @@ +# mixed key and subkeys with braces +key = value +key { + subkey1 + subkey2 = foo +} diff --git a/tools/bootconfig/samples/good-mixed-override.bconf b/tools/bootconfig/samples/good-mixed-override.bconf new file mode 100644 index 000000000000..18195b2873b6 --- /dev/null +++ b/tools/bootconfig/samples/good-mixed-override.bconf @@ -0,0 +1,4 @@ +key.foo = bar +key = value +# mixed key value can be overridden +key := value2