Messages in this thread Patch in this message |  | | From | Masami Hiramatsu <> | Subject | [PATCH 3/4] tools/bootconfig: Support mixed value and subkey test cases | Date | Sun, 16 May 2021 23:55:49 +0900 |
| |
Update test case to support mixed value and subkey on a key.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- 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
|  |