mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
kconfig: tests: test dependency after shuffling choices
Commitc8fb7d7e48
("kconfig: fix broken dependency in randconfig- generated .config") fixed the issue, but I did not add a test case. This commit adds a test case that emulates the reported situation. The test would fail withoutc8fb7d7e48
. To handle the choice "choose X", FOO must be calculated beforehand. FOO depends on A, which is a member of another choice "choose A or B". Kconfig _temporarily_ assumes the value of A to proceed. The choice "choose A or B" will be shuffled later, but the result may or may not meet "FOO depends on A". Kconfig should invalidate the symbol values and recompute them. In the real example for ARCH=arm64, the choice "Instrumentation type" needs the value of CPU_BIG_ENDIAN. The choice "Endianness" will be shuffled later. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
parent
47ad16894c
commit
f2fd2aad19
32
scripts/kconfig/tests/choice_randomize2/Kconfig
Normal file
32
scripts/kconfig/tests/choice_randomize2/Kconfig
Normal file
|
@ -0,0 +1,32 @@
|
|||
choice
|
||||
prompt "This is always invisible"
|
||||
depends on n
|
||||
|
||||
config DUMMY
|
||||
bool "DUMMY"
|
||||
|
||||
endchoice
|
||||
|
||||
choice
|
||||
prompt "Choose A or B"
|
||||
|
||||
config A
|
||||
bool "A"
|
||||
|
||||
config B
|
||||
bool "B"
|
||||
|
||||
endchoice
|
||||
|
||||
config FOO
|
||||
bool "FOO"
|
||||
depends on A
|
||||
|
||||
choice
|
||||
prompt "Choose X"
|
||||
depends on FOO
|
||||
|
||||
config X
|
||||
bool "X"
|
||||
|
||||
endchoice
|
18
scripts/kconfig/tests/choice_randomize2/__init__.py
Normal file
18
scripts/kconfig/tests/choice_randomize2/__init__.py
Normal file
|
@ -0,0 +1,18 @@
|
|||
# SPDX-License-Identifier: GPL-2.0-only
|
||||
"""
|
||||
Randomize choices with correct dependencies
|
||||
|
||||
When shuffling a choice may potentially disrupt certain dependencies, symbol
|
||||
values must be recalculated.
|
||||
|
||||
Related Linux commits:
|
||||
- c8fb7d7e48d11520ad24808cfce7afb7b9c9f798
|
||||
"""
|
||||
|
||||
|
||||
def test(conf):
|
||||
for i in range(20):
|
||||
assert conf.randconfig(seed=i) == 0
|
||||
assert (conf.config_matches('expected_config0') or
|
||||
conf.config_matches('expected_config1') or
|
||||
conf.config_matches('expected_config2'))
|
8
scripts/kconfig/tests/choice_randomize2/expected_config0
Normal file
8
scripts/kconfig/tests/choice_randomize2/expected_config0
Normal file
|
@ -0,0 +1,8 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Main menu
|
||||
#
|
||||
CONFIG_A=y
|
||||
# CONFIG_B is not set
|
||||
CONFIG_FOO=y
|
||||
CONFIG_X=y
|
7
scripts/kconfig/tests/choice_randomize2/expected_config1
Normal file
7
scripts/kconfig/tests/choice_randomize2/expected_config1
Normal file
|
@ -0,0 +1,7 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Main menu
|
||||
#
|
||||
CONFIG_A=y
|
||||
# CONFIG_B is not set
|
||||
# CONFIG_FOO is not set
|
6
scripts/kconfig/tests/choice_randomize2/expected_config2
Normal file
6
scripts/kconfig/tests/choice_randomize2/expected_config2
Normal file
|
@ -0,0 +1,6 @@
|
|||
#
|
||||
# Automatically generated file; DO NOT EDIT.
|
||||
# Main menu
|
||||
#
|
||||
# CONFIG_A is not set
|
||||
CONFIG_B=y
|
Loading…
Reference in a new issue