13 Mar 2026 04:19:06 Masami Hiramatsu (Google) <[email protected]>:
> From: Masami Hiramatsu (Google) <[email protected]> > > Add more bootconfig tests for checking the error message of > non closing brace and max number of nested braces. > > Signed-off-by: Masami Hiramatsu (Google) <[email protected]> > --- > .../bootconfig/samples/bad-non-closed-brace.bconf | 4 ++++ > tools/bootconfig/samples/bad-over-max-brace.bconf | 19 +++++++++++++++++++ > .../bootconfig/samples/exp-good-nested-brace.bconf | 1 + > tools/bootconfig/samples/good-nested-brace.bconf | 18 ++++++++++++++++++ > tools/bootconfig/test-bootconfig.sh | 9 +++++++++ > 5 files changed, 51 insertions(+) > create mode 100644 tools/bootconfig/samples/bad-non-closed-brace.bconf > create mode 100644 tools/bootconfig/samples/bad-over-max-brace.bconf > create mode 100644 tools/bootconfig/samples/exp-good-nested-brace.bconf > create mode 100644 tools/bootconfig/samples/good-nested-brace.bconf > > diff --git a/tools/bootconfig/samples/bad-non-closed-brace.bconf > b/tools/bootconfig/samples/bad-non-closed-brace.bconf > new file mode 100644 > index 000000000000..6ed9f3363dde > --- /dev/null > +++ b/tools/bootconfig/samples/bad-non-closed-brace.bconf > @@ -0,0 +1,4 @@ > +foo { > + bar { > + buz > + } > diff --git a/tools/bootconfig/samples/bad-over-max-brace.bconf > b/tools/bootconfig/samples/bad-over-max-brace.bconf > new file mode 100644 > index 000000000000..74b5dc9e21dc > --- /dev/null > +++ b/tools/bootconfig/samples/bad-over-max-brace.bconf > @@ -0,0 +1,19 @@ > +key1 { > +key2 { > +key3 { > +key4 { > +key5 { > +key6 { > +key7 { > +key8 { > +key9 { > +key10 { > +key11 { > +key12 { > +key13 { > +key14 { > +key15 { > +key16 { > +key17 { > +}}}}}}}}}}}}}}}}} > + > diff --git a/tools/bootconfig/samples/exp-good-nested-brace.bconf > b/tools/bootconfig/samples/exp-good-nested-brace.bconf > new file mode 100644 > index 000000000000..19e0f51b4553 > --- /dev/null > +++ b/tools/bootconfig/samples/exp-good-nested-brace.bconf > @@ -0,0 +1 @@ > +key1.key2.key3.key4.key5.key6.key7.key8.key9.key10.key11.key12.key13.key14.key15.key16; > diff --git a/tools/bootconfig/samples/good-nested-brace.bconf > b/tools/bootconfig/samples/good-nested-brace.bconf > new file mode 100644 > index 000000000000..980d094f296e > --- /dev/null > +++ b/tools/bootconfig/samples/good-nested-brace.bconf > @@ -0,0 +1,18 @@ > +key1 { > +key2 { > +key3 { > +key4 { > +key5 { > +key6 { > +key7 { > +key8 { > +key9 { > +key10 { > +key11 { > +key12 { > +key13 { > +key14 { > +key15 { > +key16 { > +}}}}}}}}}}}}}}}} > + > diff --git a/tools/bootconfig/test-bootconfig.sh > b/tools/bootconfig/test-bootconfig.sh > index be9bd18b1d56..fc69f815ce4a 100755 > --- a/tools/bootconfig/test-bootconfig.sh > +++ b/tools/bootconfig/test-bootconfig.sh > @@ -171,6 +171,15 @@ $BOOTCONF $INITRD > $OUTFILE > xfail grep -q 'val[[:space:]]' $OUTFILE > xpass grep -q 'val2[[:space:]]' $OUTFILE > > +echo "Showing correct line:column of no closing brace" > +cat > $TEMPCONF << EOF > +foo { > +bar { > +} > +EOF > +$BOOTCONF -a $TEMPCONF $INITRD 2> $OUTFILE > +xpass grep -q "1:1" $OUTFILE > + > echo "=== expected failure cases ===" > for i in samples/bad-* ; do > xfail $BOOTCONF -a $i $INITRD Acked-By: Josh Law <[email protected]>
