From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Alistair Delva <adelva@google.com>,
mhiramat@kernel.org, linux-doc@vger.kernel.org,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 2/3] tools/bootconfig: Add testcases for value override operator
Date: Thu, 16 Jul 2020 01:00:38 +0900 [thread overview]
Message-ID: <159482883824.126704.2166030493721357163.stgit@devnote2> (raw)
In-Reply-To: <159482882056.126704.15508672095852220119.stgit@devnote2>
Add some testcases and examples for value override operator.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
tools/bootconfig/samples/bad-override.bconf | 3 +++
tools/bootconfig/samples/bad-override2.bconf | 3 +++
tools/bootconfig/samples/good-override.bconf | 6 ++++++
tools/bootconfig/test-bootconfig.sh | 13 +++++++++++++
4 files changed, 25 insertions(+)
create mode 100644 tools/bootconfig/samples/bad-override.bconf
create mode 100644 tools/bootconfig/samples/bad-override2.bconf
create mode 100644 tools/bootconfig/samples/good-override.bconf
diff --git a/tools/bootconfig/samples/bad-override.bconf b/tools/bootconfig/samples/bad-override.bconf
new file mode 100644
index 000000000000..fde6c561512e
--- /dev/null
+++ b/tools/bootconfig/samples/bad-override.bconf
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 000000000000..688587cb023c
--- /dev/null
+++ b/tools/bootconfig/samples/bad-override2.bconf
@@ -0,0 +1,3 @@
+key = value
+# We can not override pre-defined value with subkey
+key.subkey := value
diff --git a/tools/bootconfig/samples/good-override.bconf b/tools/bootconfig/samples/good-override.bconf
new file mode 100644
index 000000000000..7d31d5f8fbd8
--- /dev/null
+++ b/tools/bootconfig/samples/good-override.bconf
@@ -0,0 +1,6 @@
+# Override the value
+key.word = 1,2,4
+key.word := 2,3
+
+# No pre-defined key
+key.new.word := "new"
diff --git a/tools/bootconfig/test-bootconfig.sh b/tools/bootconfig/test-bootconfig.sh
index 3c2ab9e75730..56284b98d8f0 100755
--- a/tools/bootconfig/test-bootconfig.sh
+++ b/tools/bootconfig/test-bootconfig.sh
@@ -117,6 +117,19 @@ xpass grep -q "bar" $OUTFILE
xpass grep -q "baz" $OUTFILE
xpass grep -q "qux" $OUTFILE
+echo "Override same-key values"
+cat > $TEMPCONF << EOF
+key = bar, baz
+key := qux
+EOF
+echo > $INITRD
+
+xpass $BOOTCONF -a $TEMPCONF $INITRD
+$BOOTCONF $INITRD > $OUTFILE
+xfail grep -q "bar" $OUTFILE
+xfail grep -q "baz" $OUTFILE
+xpass grep -q "qux" $OUTFILE
+
echo "Double/single quotes test"
echo "key = '\"string\"';" > $TEMPCONF
$BOOTCONF -a $TEMPCONF $INITRD
next prev parent reply other threads:[~2020-07-15 16:02 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 16:00 [PATCH 0/3] bootconfig: Add value override operator Masami Hiramatsu
2020-07-15 16:00 ` [PATCH 1/3] lib/bootconfig: Add override operator support Masami Hiramatsu
2020-07-15 16:00 ` Masami Hiramatsu [this message]
2020-07-15 16:00 ` [PATCH 3/3] Documentation: bootconfig: Add bootconfig override operator Masami Hiramatsu
2020-07-15 20:45 ` [PATCH 0/3] bootconfig: Add value " Steven Rostedt
2020-07-15 22:38 ` Masami Hiramatsu
2020-07-16 0:02 ` Steven Rostedt
2020-07-16 1:27 ` Masami Hiramatsu
2020-07-30 0:56 ` Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=159482883824.126704.2166030493721357163.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=adelva@google.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).