diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2020-07-15 19:00:38 +0300 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2020-08-03 23:22:29 +0300 |
| commit | 81464192839de0b5bc84c5739381101e04d94f62 (patch) | |
| tree | 90f505647355bc09a5e9bd840b7e738ef35a88b5 | |
| parent | a2de2f86ae3831736dc906f9559b600f186403fe (diff) | |
| download | linux-81464192839de0b5bc84c5739381101e04d94f62.tar.xz | |
tools/bootconfig: Add testcases for value override operator
Add some testcases and examples for value override operator.
Link: https://lkml.kernel.org/r/159482883824.126704.2166030493721357163.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
| -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-override.bconf | 6 | ||||
| -rwxr-xr-x | tools/bootconfig/test-bootconfig.sh | 13 |
4 files changed, 25 insertions, 0 deletions
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 |