| Message ID | 1517877294-4826-10-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add Kconfig unit tests | expand |
On Tue, Feb 6, 2018 at 1:34 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > If a symbols has dependency on the preceding symbol, the menu entry > should become the submenu of the preceding one, and displayed with > deeper indentation. > > This is done by restructuring the menu tree in menu_finalize(). > It is a bit complicated computation, so let's add a test case. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- > > .../kconfig/tests/auto_submenu_creation/Kconfig | 50 ++++++++++++++++++++++ > .../tests/auto_submenu_creation/__init__.py | 12 ++++++ > .../tests/auto_submenu_creation/expected_stdout | 10 +++++ > 3 files changed, 72 insertions(+) > create mode 100644 scripts/kconfig/tests/auto_submenu_creation/Kconfig > create mode 100644 scripts/kconfig/tests/auto_submenu_creation/__init__.py > create mode 100644 scripts/kconfig/tests/auto_submenu_creation/expected_stdout > > diff --git a/scripts/kconfig/tests/auto_submenu_creation/Kconfig b/scripts/kconfig/tests/auto_submenu_creation/Kconfig > new file mode 100644 > index 0000000..9e11502 > --- /dev/null > +++ b/scripts/kconfig/tests/auto_submenu_creation/Kconfig > @@ -0,0 +1,50 @@ > +config A > + bool "A" > + default y > + > +config A0 > + bool "A0" > + depends on A > + default y > + help > + This depends on A, so should be a submenu of A. > + > +config A0_0 > + bool "A1_0" > + depends on A0 > + help > + Submenus are created recursively. > + This should be a submenu of A0. > + > +config A1 > + bool "A1" > + depends on A > + default y > + help > + This should line up with A0. > + > +choice > + prompt "choice" > + depends on A1 > + help > + Choice should become a submenu as well. > + > +config A1_0 > + bool "A1_0" > + > +config A1_1 > + bool "A1_1" > + > +endchoice > + > +config B > + bool "B" > + help > + This is independent of A. > + > +config C > + bool "C" > + depends on A > + help > + This depends on A, but not a consecutive item, so should not > + be a submenu. > diff --git a/scripts/kconfig/tests/auto_submenu_creation/__init__.py b/scripts/kconfig/tests/auto_submenu_creation/__init__.py > new file mode 100644 > index 0000000..dda866d > --- /dev/null > +++ b/scripts/kconfig/tests/auto_submenu_creation/__init__.py > @@ -0,0 +1,12 @@ > +""" > +Create submenu for symbols that depend on the preceding one > +=========================================================== > + > +If a symbols has dependency on the preceding symbol, the menu entry > +should become the submenu of the preceding one, and displayed with > +deeper indentation. > +""" > + > +def test(conf): > + assert conf.oldaskconfig() == 0 > + assert conf.stdout_contains('expected_stdout') > diff --git a/scripts/kconfig/tests/auto_submenu_creation/expected_stdout b/scripts/kconfig/tests/auto_submenu_creation/expected_stdout > new file mode 100644 > index 0000000..bf5236f > --- /dev/null > +++ b/scripts/kconfig/tests/auto_submenu_creation/expected_stdout > @@ -0,0 +1,10 @@ > +A (A) [Y/n/?] (NEW) > + A0 (A0) [Y/n/?] (NEW) > + A1_0 (A0_0) [N/y/?] (NEW) > + A1 (A1) [Y/n/?] (NEW) > + choice > + > 1. A1_0 (A1_0) (NEW) > + 2. A1_1 (A1_1) (NEW) > + choice[1-2?]: > +B (B) [N/y/?] (NEW) > +C (C) [N/y/?] (NEW) > -- > 2.7.4 > Reviewed-by: Ulf Magnusson <ulfalizer@gmail.com>
diff --git a/scripts/kconfig/tests/auto_submenu_creation/Kconfig b/scripts/kconfig/tests/auto_submenu_creation/Kconfig new file mode 100644 index 0000000..9e11502 --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu_creation/Kconfig @@ -0,0 +1,50 @@ +config A + bool "A" + default y + +config A0 + bool "A0" + depends on A + default y + help + This depends on A, so should be a submenu of A. + +config A0_0 + bool "A1_0" + depends on A0 + help + Submenus are created recursively. + This should be a submenu of A0. + +config A1 + bool "A1" + depends on A + default y + help + This should line up with A0. + +choice + prompt "choice" + depends on A1 + help + Choice should become a submenu as well. + +config A1_0 + bool "A1_0" + +config A1_1 + bool "A1_1" + +endchoice + +config B + bool "B" + help + This is independent of A. + +config C + bool "C" + depends on A + help + This depends on A, but not a consecutive item, so should not + be a submenu. diff --git a/scripts/kconfig/tests/auto_submenu_creation/__init__.py b/scripts/kconfig/tests/auto_submenu_creation/__init__.py new file mode 100644 index 0000000..dda866d --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu_creation/__init__.py @@ -0,0 +1,12 @@ +""" +Create submenu for symbols that depend on the preceding one +=========================================================== + +If a symbols has dependency on the preceding symbol, the menu entry +should become the submenu of the preceding one, and displayed with +deeper indentation. +""" + +def test(conf): + assert conf.oldaskconfig() == 0 + assert conf.stdout_contains('expected_stdout') diff --git a/scripts/kconfig/tests/auto_submenu_creation/expected_stdout b/scripts/kconfig/tests/auto_submenu_creation/expected_stdout new file mode 100644 index 0000000..bf5236f --- /dev/null +++ b/scripts/kconfig/tests/auto_submenu_creation/expected_stdout @@ -0,0 +1,10 @@ +A (A) [Y/n/?] (NEW) + A0 (A0) [Y/n/?] (NEW) + A1_0 (A0_0) [N/y/?] (NEW) + A1 (A1) [Y/n/?] (NEW) + choice + > 1. A1_0 (A1_0) (NEW) + 2. A1_1 (A1_1) (NEW) + choice[1-2?]: +B (B) [N/y/?] (NEW) +C (C) [N/y/?] (NEW)
If a symbols has dependency on the preceding symbol, the menu entry should become the submenu of the preceding one, and displayed with deeper indentation. This is done by restructuring the menu tree in menu_finalize(). It is a bit complicated computation, so let's add a test case. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- .../kconfig/tests/auto_submenu_creation/Kconfig | 50 ++++++++++++++++++++++ .../tests/auto_submenu_creation/__init__.py | 12 ++++++ .../tests/auto_submenu_creation/expected_stdout | 10 +++++ 3 files changed, 72 insertions(+) create mode 100644 scripts/kconfig/tests/auto_submenu_creation/Kconfig create mode 100644 scripts/kconfig/tests/auto_submenu_creation/__init__.py create mode 100644 scripts/kconfig/tests/auto_submenu_creation/expected_stdout -- 2.7.4