linux-kernel - Re: [PATCH v2 09/11] kconfig: unittest: test randconfig for choice in choice

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAFkk2KQTjnTLkBx_8jXLejxVJLHV6gijN0_MCYDwbsL+KNkp=w@mail.gmail.com>
Date:   Fri, 2 Mar 2018 12:14:39 +0100
From:   Ulf Magnusson <ulfalizer@...il.com>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
Cc:     Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        Sam Ravnborg <sam@...nborg.org>,
        Michal Marek <michal.lkml@...kovi.net>,
        Randy Dunlap <rdunlap@...radead.org>,
        "Luis R . Rodriguez" <mcgrof@...nel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2 09/11] kconfig: unittest: test randconfig for choice in choice

On Fri, Mar 2, 2018 at 5:31 AM, Masahiro Yamada
<yamada.masahiro@...ionext.com> wrote:
> Commit 3b9a19e08960 ("kconfig: loop as long as we changed some symbols
> in randconfig") fixed randconfig where a choice contains a sub-choice.
> Prior to that commit, the sub-choice values were not set.
>
> This is complicated usage, but it is still used in the real world;
> drivers/usb/gadget/legacy/Kconfig is source'd in a choice context,
> then creates a sub-choice in it.

That file is the only one that does all that weird choice stuff btw.

It's an optional choice with the choice symbols source'd from a
separate file, containing non-symbol items and symbols that end up in
implicit submenus and aren't considered choice symbols.

It's as if it was written to make use of as much obscure Kconfig stuff
as possible. :P

>
> For the test case in this commit, there are 3 possible results.
>
> Case 1:
>   CONFIG_A=y
>   # CONFIG_B is not set
>
> Case 2:
>   # CONFIG_A is not set
>   CONFIG_B=y
>   CONFIG_C=y
>   # CONFIG_D is not set
>
> Case 3:
>   # CONFIG_A is not set
>   CONFIG_B=y
>   # CONFIG_C is not set
>   CONFIG_D=y
>   CONFIG_E=y
>
> So, this test iterates several times, and checks if the result is
> either of the three.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@...ionext.com>
> ---
>
> Changes in v2:
>   - Newly added
>
>  scripts/kconfig/tests/rand_nested_choice/Kconfig   | 33 ++++++++++++++++++++++
>  .../kconfig/tests/rand_nested_choice/__init__.py   | 16 +++++++++++
>  .../tests/rand_nested_choice/expected_stdout0      |  2 ++
>  .../tests/rand_nested_choice/expected_stdout1      |  4 +++
>  .../tests/rand_nested_choice/expected_stdout2      |  5 ++++
>  5 files changed, 60 insertions(+)
>  create mode 100644 scripts/kconfig/tests/rand_nested_choice/Kconfig
>  create mode 100644 scripts/kconfig/tests/rand_nested_choice/__init__.py
>  create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout0
>  create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout1
>  create mode 100644 scripts/kconfig/tests/rand_nested_choice/expected_stdout2
>
> diff --git a/scripts/kconfig/tests/rand_nested_choice/Kconfig b/scripts/kconfig/tests/rand_nested_choice/Kconfig
> new file mode 100644
> index 0000000..c591d51
> --- /dev/null
> +++ b/scripts/kconfig/tests/rand_nested_choice/Kconfig
> @@ -0,0 +1,33 @@
> +choice
> +       prompt "choice"
> +
> +config A
> +       bool "A"
> +
> +config B
> +       bool "B"
> +
> +if B
> +choice
> +       prompt "sub choice"
> +
> +config C
> +       bool "C"
> +
> +config D
> +       bool "D"
> +
> +if D
> +choice
> +       prompt "subsub choice"
> +
> +config E
> +       bool "E"
> +
> +endchoice
> +endif # D
> +
> +endchoice
> +endif # B
> +
> +endchoice
> diff --git a/scripts/kconfig/tests/rand_nested_choice/__init__.py b/scripts/kconfig/tests/rand_nested_choice/__init__.py
> new file mode 100644
> index 0000000..9ceadf6
> --- /dev/null
> +++ b/scripts/kconfig/tests/rand_nested_choice/__init__.py
> @@ -0,0 +1,16 @@
> +"""
> +Set random values resursively in netsted choices.

Two small typos: recursively, nested

> +
> +Kconfig can create a choice-in-choice structure by using 'if' statement.
> +randconfig should correctly set randome choice values.

Typo: random

> +
> +Related Linux commit: 3b9a19e08960e5cdad5253998637653e592a3c29
> +"""
> +
> +
> +def test(conf):
> +    for i in range(20):
> +        assert conf.randconfig() == 0
> +        assert (conf.config_contains('expected_stdout0') or
> +                conf.config_contains('expected_stdout1') or
> +                conf.config_contains('expected_stdout2'))
> diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout0 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0
> new file mode 100644
> index 0000000..05450f3
> --- /dev/null
> +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout0
> @@ -0,0 +1,2 @@
> +CONFIG_A=y
> +# CONFIG_B is not set
> diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout1 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1
> new file mode 100644
> index 0000000..37ab295
> --- /dev/null
> +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout1
> @@ -0,0 +1,4 @@
> +# CONFIG_A is not set
> +CONFIG_B=y
> +CONFIG_C=y
> +# CONFIG_D is not set
> diff --git a/scripts/kconfig/tests/rand_nested_choice/expected_stdout2 b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2
> new file mode 100644
> index 0000000..849ff47
> --- /dev/null
> +++ b/scripts/kconfig/tests/rand_nested_choice/expected_stdout2
> @@ -0,0 +1,5 @@
> +# CONFIG_A is not set
> +CONFIG_B=y
> +# CONFIG_C is not set
> +CONFIG_D=y
> +CONFIG_E=y
> --
> 2.7.4
>

Reviewed-by: Ulf Magnusson <ulfalizer@...il.com>

Cheers,
Ulf