diff options
| author |   Masami Hiramatsu <mhiramat@kernel.org> | 2021-06-02 17:19:15 +0900 |
|---|---|---|
| committer |   Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-06-10 13:41:26 -0400 |
| commit | 29e1c1ad3ff7f345d80c7b81b08175f5a8c84122 (patch) | |
| tree | 811515bc661d926767f3f07449fbbf7a1f2d4847 /tools/bootconfig | |
| parent | bootconfig: Support mixing a value and subkeys under a key (diff) | |
| download | linux-dev-29e1c1ad3ff7f345d80c7b81b08175f5a8c84122.tar.xz linux-dev-29e1c1ad3ff7f345d80c7b81b08175f5a8c84122.zip | |
tools/bootconfig: Support mixed value and subkey test cases
Update test case to support mixed value and subkey on a key.
Link: https://lkml.kernel.org/r/162262195568.264090.12431204030021242896.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'tools/bootconfig')
| -rw-r--r-- | tools/bootconfig/samples/bad-override.bconf | 3 | ||||
| -rw-r--r-- | tools/bootconfig/samples/bad-override2.bconf | 3 | ||||
| -rw-r--r-- | tools/bootconfig/samples/good-mixed-append.bconf | 4 | ||||
| -rw-r--r-- | tools/bootconfig/samples/good-mixed-kv1.bconf (renamed from tools/bootconfig/samples/bad-mixed-kv1.bconf) | 0 | ||||
| -rw-r--r-- | tools/bootconfig/samples/good-mixed-kv2.bconf (renamed from tools/bootconfig/samples/bad-mixed-kv2.bconf) | 0 | ||||
| -rw-r--r-- | tools/bootconfig/samples/good-mixed-kv3.bconf | 6 | ||||
| -rw-r--r-- | tools/bootconfig/samples/good-mixed-override.bconf | 4 |
7 files changed, 14 insertions, 6 deletions
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/bad-mixed-kv1.bconf b/tools/bootconfig/samples/good-mixed-kv1.bconf index 1761547dd05c..1761547dd05c 100644 --- a/tools/bootconfig/samples/bad-mixed-kv1.bconf +++ b/tools/bootconfig/samples/good-mixed-kv1.bconf diff --git a/tools/bootconfig/samples/bad-mixed-kv2.bconf b/tools/bootconfig/samples/good-mixed-kv2.bconf index 6b32e0c3878c..6b32e0c3878c 100644 --- a/tools/bootconfig/samples/bad-mixed-kv2.bconf +++ b/tools/bootconfig/samples/good-mixed-kv2.bconf 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 |