Align Kconfig to Linux 4.17-rc4 with minimal impact on non-kconfig files. Previous Kconfig sync was done by commitlime2-spibf7ab1e70f
("kconfig: re-sync with Linux 4.10") and it achieved almost perfect alignment with a few (intended) exceptions, caused by below U-boot commits: [A] v2015.045f9eb22075
("kbuild: remove scripts/multiconfig.sh") [B] v2015.0720c20826ef
("Kconfig: Enable usage of escape char '\' in string values") [C] v2016.01da58dec866
("Various Makefiles: Add SPDX-License-Identifier tags") [D] v2016.035b8031ccb4
("Add more SPDX-License-Identifier tags") [E] v2016.03192bc6948b
("Fix GCC format-security errors and convert sprintfs.") Here is the list of Kconfig commits which followed the v4.10 alignment: [F] v2018.010931ed3c0d
("kconfig/symbol.c: use correct pointer type argument for sizeof") [G] v2018.031414e09b4f
("kconfig: revert change that was not needed for -Wformat-security") [H] v2018.0583d290c56f
("SPDX: Convert all of our single license tags to Linux Kernel style") Commit [F] was subsequently applied to Linux kernel as commit [I] with the same patch id, so it won't contribute to further misalignment. [I] v4.15-rc1 88127dae6ed9 ("kconfig/symbol.c: use correct pointer type argument for sizeof") Commit [G] is a Kconfig-specific revert of commit [E]. Commit [H] relocated and reformatted the license doing no functional change. In summary, the only functional change that makes U-boot Kconfig diverge from Linux Kconfig is commit [B]. After a brief analysis, the purpose of [B] seems to be placing "\n" literals in string symbols like CONFIG_AUTOBOOT_PROMPT="autoboot in %d seconds\n" in order to pass them directly to printf and expect correct output at runtime. Currently, Linux doesn't seem to have this requirement, so for the moment [B] looks like a U-boot specific feature/fix. From point of view of further Kconfig alignment and backporting efforts, it is highly desired that commits like [B] are propagated to Linux and any Kconfig fixes/features are contributed to Linux kernel first. This specific Kconfig re-sync just keeps [B] in place. Contrary to 4.10 Kconfig re-sync (which achieves zero non-kconfig changes), 4.17-rc4 re-sync does some amount of updates in Kbuild (striving to keep them at minimum), due to a number of reasons: * Kbuild is affected by the removal of Kconfig "*shipped" files and now requires flex and bison pre-installed on the host. * PYTHON{2,3} variables are defined in top-level Makefile as prerequisite for running the newly developed Kconfig unit tests. * silentoldconfig becomes an "internal implementation detail" deprecated for external use, being renamed to syncconfig. The exact non-kconfig files touched by this commit are: $ git show --format="" --stat -- ':!scripts/kconfig' .gitignore | 2 ++ Makefile | 9 +++++++-- scripts/Makefile.build | 11 +++++++++++ scripts/Makefile.lib | 41 ++++++++++++----------------------------- The imported Linux commits touching the above files are: c054be10ffdbd5 ("remove gperf left-overs from build system") 73a4f6dbe70a1b ("kbuild: add LEX and YACC variables") 033dba2ec06c47 ("kbuild: prepare to remove C files pre-generated by flex and bison") eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX") e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX") d59fbbd09d5d6b ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)") 911a91c39cabcb H ("kconfig: rename silentoldconfig to syncconfig") 59889300274569 (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore") 9a8dfb394c0467 ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile") 833e622459432e H ("genksyms: generate lexer and parser during build instead of shipping") b23d1a241f4eb4 H ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically") e9781b52d4e0e3 H ("kbuild: add PYTHON2 and PYTHON3 variables") The commits marked with 'H' are assessed as "hard" (build will fail) prerequisites and the rest of them are assessed as "soft" prerequisites for the re-sync. In spite of relatively high number of non-H commits, they belong to this Kconfig update topic-wise and decrease the number of cherry pick conflicts for many commits in this series. Additional effort can be put in eliminating the soft prerequisites, if really needed. The commits which contributed to this Kconfig re-sync are listed below. Whenever a conflict resolution has been performed (mostly by hand, but sometimes automatically by git), it is revealed by the '!' sign in the second column, which means a patch id mismatch between Linux and U-boot commits: 9be3213b14d44f ("gconfig: remove misleading parentheses around a condition") ff85a1a80e0034 ("kconfig: Check for libncurses before menuconfig") ad8181060788c8 ("kconfig: fix sparse warnings in nconfig") cb77f0d623ff33 ! ("scripts: Switch to more portable Perl shebang") bb3290d91695bb ! ("Remove gperf usage from toolchain") c054be10ffdbd5 ("remove gperf left-overs from build system") b24413180f5600 ! ("License cleanup: add SPDX GPL-2.0 license identifier to files with no license") 9059a3493efea6 ! ("kconfig: fix relational operators for bool and tristate symbols") 2c37e08464a850 ("kconfig: Warn if choice default is not in choice") 33ca1a24866373 ("kconfig: Document the 'menu' struct") 52aede4ba5efd1 ("kconfig: Document the 'symbol' struct") c873443430ebd1 ("kconfig: Sync zconf.y with zconf.tab.c_shipped") 9a826842ff2fbd ("kconfig: Rename menu_check_dep() to rewrite_m()") fa8cedaef814ce ("kconfig: Clarify expression rewriting") f77850d3fe0c96 ("kconfig: Clean up modules handling and fix crash") e3b03bf29d6b99 ("kconfig: display recursive dependency resolution hint just once") 73a4f6dbe70a1b ! ("kbuild: add LEX and YACC variables") 033dba2ec06c47 ! ("kbuild: prepare to remove C files pre-generated by flex and bison") 29c833061c1d8c ("kconfig: generate lexer and parser during build instead of shipping") 26e47a3c11a25c ("kconfig: Don't leak symbol names during parsing") 24161a6711c945 ("kconfig: Don't leak 'source' filenames during parsing") bc28fe1d5ede88 ("kconfig: Don't leak 'option' arguments during parsing") 0724a7c32a54e3 ("kconfig: Don't leak main menus during parsing") ae7440ef0c8013 ("kconfig: Fix automatic menu creation mem leak") 5b1374b3b3c2fc ("kconfig: Fix expr_free() E_NOT leak") 7cf33f88e29410 ("kconfig: Fix choice symbol expression leak") 05cccce580456d ("kconfig: Document automatic submenu creation code") 0735f7e5def2ab ("kconfig: Document important expression functions") df60f4b92d3d0b ("kconfig: Remove menu_end_entry()") b92d804a51796b ("kconfig: drop 'boolean' keyword") 6479f327dea60d ("kconfig: Warn if there is more than one help text") 52e58a3caeba5d ("kconfig: make input_mode static") 5a3dc717b3c785 ("kconfig: make xfgets() really static") 84dd95d4f87a0d ("kconfig: make conf_unsaved a local variable of conf_read()") 765f4cdef6f80d ("kconfig: use default 'yy' prefix for lexer and parser") eea199b445f64c ("kbuild: remove unnecessary LEX_PREFIX and YACC_PREFIX") e71de5ee08dcb0 ("kbuild: remove remaining use of undefined YACC_PREFIX") d59fbbd09d5d6b ! ("kbuild: replace hardcoded bison in cmd_bison_h with $(YACC)") 3e41ba05b6d60c ("kconfig: Document SYMBOL_OPTIONAL logic") d3465af60f4471 ("kconfig: Clarify choice dependency propagation") 9d1a9e8bc18bea ("kconfig: Document 'if' flattening logic") b53688014e3325 ("kconfig: Clarify menu and 'if' dependency propagation") d0fd0428ecf04b ("kconfig: fix make xconfig when gettext is missing") 312ee68752faaa ("kconfig: announce removal of oldnoconfig if used") 1ccb27143360bd ("kconfig: make "Selected by:" and "Implied by:" readable") cedd55d49dee94 ! ("kconfig: Remove silentoldconfig from help and docs; fix kconfig/conf's help") 1b9eda2e4892cb ("kconfig: Warn if help text is blank") cb67ab2cd2b8ab ("kconfig: do not write choice values when their dependency becomes n") 4f208f392103e8 ("kconfig: show '?' prompt even if no help text is available") cd58a91def2acc ("kconfig: remove 'config*' pattern from .gitignnore") d2a04648a5dbc3 ("kconfig: remove check_stdin()") f3ff6fb5db68bc ("kconfig: echo stdin to stdout if either is redirected") 9e3e10c725360b ("kconfig: send error messages to stderr") d717f24d8c6808 ("kconfig: add xrealloc() helper") 523ca58b7db2e3 ("kconfig: remove const qualifier from sym_expand_string_value()") cd81fc82b93fa4 ("kconfig: add xstrdup() helper") f4bc1eefc1608e ("kconfig: set SYMBOL_AUTO to the symbol marked with defconfig_list") bf0bbdcf100322 ("kconfig: Don't leak choice names during parsing") 1a90ce36c6eff6 ("kconfig: Update ncurses package names for menuconfig") 5ae6fcc4bb82bd ("kconfig: fix line number in recursive inclusion error message") 07a422bb213adb ! ("kbuild: restore autoksyms.h touch to the top Makefile") 9a47ceec543bfb ("kconfig: clean-up reverse dependency help implementation") d9119b5925a03b ("kconfig: Print reverse dependencies in groups") f467c5640c29ad ("kconfig: only write '# CONFIG_FOO is not set' for visible symbols") 59a80b5e892dde ("kconfig: do not call check_conf() for olddefconfig") 4bb3a5b085cd6f ("kconfig: remove unneeded input_mode test in conf()") 99f0b6578bab44 ("kconfig: remove redundant input_mode test for check_conf() loop") 2aad9b89621386 ("kconfig: hide irrelevant sub-menus for oldconfig") 81d2bc2273052e ("kconfig: invoke oldconfig instead of silentoldconfig from local*config") 911a91c39cabcb ! ("kconfig: rename silentoldconfig to syncconfig") 2a61625835c7c8 ! ("kconfig: remove redundant streamline_config.pl prerequisite") 022a4bf6b59dfd ("kconfig: tests: add framework for Kconfig unit testing") 1903c511905984 ("kconfig: tests: add basic choice tests") 49ac3c0c3aa3b7 ("kconfig: tests: test automatic submenu creation") b76960c0f6b25d ("kconfig: tests: test if new symbols in choice are asked") 930c429a656fdb ("kconfig: tests: check unneeded "is not set" with unmet dependency") ee236610653ede ("kconfig: tests: check visibility of tristate choice values in y choice") beaaddb625400e ("kconfig: tests: test defconfig when two choices interact") 3e4888c2e3d77d ("kconfig: tests: test randconfig for choice in choice") 29c434f367ea7b ("kconfig: tests: test if recursive dependencies are detected") e2c75e7667c737 ("kconfig: tests: test if recursive inclusion is detected") f622f827958162 ("kconfig: warn unmet direct dependency of tristate symbols selected by y") f8f69dc0b4e070 ("kconfig: make unmet dependency warnings readable") 26561514cc9def ("kconfig: do not include both curses.h and ncurses.h for nconfig") 32a94b8b0c3e5a ("kconfig: remove duplicated file name and lineno of recursive inclusion") 379a8eb8eb1a55 ("kconfig: detect recursive inclusion earlier") 18492685e479fd ("kconfig: use yylineno option instead of manual lineno increments") 59889300274569 ! (".gitignore: move *.lex.c *.tab.[ch] patterns to the top-level .gitignore") 9a8dfb394c0467 ! ("kbuild: clean up *.lex.c and *.tab.[ch] patterns from top-level Makefile") 833e622459432e ! ("genksyms: generate lexer and parser during build instead of shipping") b23d1a241f4eb4 ! ("kbuild: add %.lex.c and %.tab.[ch] to 'targets' automatically") 17baab68d337a0 ("kconfig: extend output of 'listnewconfig'") e9781b52d4e0e3 ! ("kbuild: add PYTHON2 and PYTHON3 variables") The current Kconfig update generates below build-time warnings: YACC scripts/dtc/dtc-parser.tab.h scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr] YACC scripts/dtc/dtc-parser.tab.c scripts/dtc/dtc-parser.y: warning: 3 shift/reduce conflicts [-Wconflicts-sr] This seems to happen because the Kbuild updates apparently didn't make room for both "*shipped"-based builds and flex/bison-based builds. A similar problem has been reported for genksyms parser in v4.17-rc1 commit 833e622459432e ("genksyms: generate lexer and parser during build instead of shipping"). I have figured out empirically that the warnings are healed after updating the in-tree U-boot DTC to upstream v1.4.6-9, same as done by Linux v4.17-rc1 commit 9130ba88464032 ("scripts/dtc: Update to upstream version v1.4.6-9-gaadd0b65c987"). Whether fixing the DTC-related yacc warnings should be done together with the Kconfig re-sync, I would like to hear from community. My testing was limited to: - make defconfig all - make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- r8a7795_ulcb_defconfig all - comparing .config before and after the re-sync - running the newly imported Kconfig unit tests as seen below: $ make testconfig Tested-by: Petr Vorel <petr.vorel@gmail.com> ============================= test session starts ============================= scripts/kconfig/tests/auto_submenu/__init__.py::test PASSED [ 7%] scripts/kconfig/tests/choice/__init__.py::test_oldask0 PASSED [ 14%] scripts/kconfig/tests/choice/__init__.py::test_oldask1 PASSED [ 21%] scripts/kconfig/tests/choice/__init__.py::test_allyes PASSED [ 28%] scripts/kconfig/tests/choice/__init__.py::test_allmod PASSED [ 35%] scripts/kconfig/tests/choice/__init__.py::test_allno PASSED [ 42%] scripts/kconfig/tests/choice/__init__.py::test_alldef PASSED [ 50%] scripts/kconfig/tests/choice_value_with_m_dep/__init__.py::test PASSED [ 57%] scripts/kconfig/tests/err_recursive_inc/__init__.py::test PASSED [ 64%] scripts/kconfig/tests/inter_choice/__init__.py::test PASSED [ 71%] scripts/kconfig/tests/new_choice_with_dep/__init__.py::test PASSED [ 78%] scripts/kconfig/tests/no_write_if_dep_unmet/__init__.py::test PASSED [ 85%] scripts/kconfig/tests/rand_nested_choice/__init__.py::test PASSED [ 92%] scripts/kconfig/tests/warn_recursive_dep/__init__.py::test PASSED [100%] ========================== 14 passed in 0.34 seconds ========================== Signed-off-by: Eugeniu Rosca <erosca@de.adit-jv.com> Reviewed-by: Masahiro Yamada <yamada.masahiro@socionext.com> Tested-by: Petr Vorel <petr.vorel@gmail.com>
parent
8ada17dde8
commit
e91610da7c
@ -0,0 +1,53 @@ |
||||
|
||||
static struct kconf_id kconf_id_array[] = { |
||||
{ "mainmenu", T_MAINMENU, TF_COMMAND }, |
||||
{ "menu", T_MENU, TF_COMMAND }, |
||||
{ "endmenu", T_ENDMENU, TF_COMMAND }, |
||||
{ "source", T_SOURCE, TF_COMMAND }, |
||||
{ "choice", T_CHOICE, TF_COMMAND }, |
||||
{ "endchoice", T_ENDCHOICE, TF_COMMAND }, |
||||
{ "comment", T_COMMENT, TF_COMMAND }, |
||||
{ "config", T_CONFIG, TF_COMMAND }, |
||||
{ "menuconfig", T_MENUCONFIG, TF_COMMAND }, |
||||
{ "help", T_HELP, TF_COMMAND }, |
||||
{ "---help---", T_HELP, TF_COMMAND }, |
||||
{ "if", T_IF, TF_COMMAND|TF_PARAM }, |
||||
{ "endif", T_ENDIF, TF_COMMAND }, |
||||
{ "depends", T_DEPENDS, TF_COMMAND }, |
||||
{ "optional", T_OPTIONAL, TF_COMMAND }, |
||||
{ "default", T_DEFAULT, TF_COMMAND, S_UNKNOWN }, |
||||
{ "prompt", T_PROMPT, TF_COMMAND }, |
||||
{ "tristate", T_TYPE, TF_COMMAND, S_TRISTATE }, |
||||
{ "def_tristate", T_DEFAULT, TF_COMMAND, S_TRISTATE }, |
||||
{ "bool", T_TYPE, TF_COMMAND, S_BOOLEAN }, |
||||
{ "def_bool", T_DEFAULT, TF_COMMAND, S_BOOLEAN }, |
||||
{ "int", T_TYPE, TF_COMMAND, S_INT }, |
||||
{ "hex", T_TYPE, TF_COMMAND, S_HEX }, |
||||
{ "string", T_TYPE, TF_COMMAND, S_STRING }, |
||||
{ "select", T_SELECT, TF_COMMAND }, |
||||
{ "imply", T_IMPLY, TF_COMMAND }, |
||||
{ "range", T_RANGE, TF_COMMAND }, |
||||
{ "visible", T_VISIBLE, TF_COMMAND }, |
||||
{ "option", T_OPTION, TF_COMMAND }, |
||||
{ "on", T_ON, TF_PARAM }, |
||||
{ "modules", T_OPT_MODULES, TF_OPTION }, |
||||
{ "defconfig_list", T_OPT_DEFCONFIG_LIST, TF_OPTION }, |
||||
{ "env", T_OPT_ENV, TF_OPTION }, |
||||
{ "allnoconfig_y", T_OPT_ALLNOCONFIG_Y, TF_OPTION }, |
||||
}; |
||||
|
||||
#define KCONF_ID_ARRAY_SIZE (sizeof(kconf_id_array)/sizeof(struct kconf_id)) |
||||
|
||||
static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len) |
||||
{ |
||||
int i; |
||||
|
||||
for (i = 0; i < KCONF_ID_ARRAY_SIZE; i++) { |
||||
struct kconf_id *id = kconf_id_array+i; |
||||
int l = strlen(id->name); |
||||
|
||||
if (len == l && !memcmp(str, id->name, len)) |
||||
return id; |
||||
} |
||||
return NULL; |
||||
} |
@ -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 can/should not |
||||
be a submenu. |
@ -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') |
@ -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) |
@ -0,0 +1,54 @@ |
||||
config MODULES |
||||
bool "Enable loadable module support" |
||||
option modules |
||||
default y |
||||
|
||||
choice |
||||
prompt "boolean choice" |
||||
default BOOL_CHOICE1 |
||||
|
||||
config BOOL_CHOICE0 |
||||
bool "choice 0" |
||||
|
||||
config BOOL_CHOICE1 |
||||
bool "choice 1" |
||||
|
||||
endchoice |
||||
|
||||
choice |
||||
prompt "optional boolean choice" |
||||
optional |
||||
default OPT_BOOL_CHOICE1 |
||||
|
||||
config OPT_BOOL_CHOICE0 |
||||
bool "choice 0" |
||||
|
||||
config OPT_BOOL_CHOICE1 |
||||
bool "choice 1" |
||||
|
||||
endchoice |
||||
|
||||
choice |
||||
prompt "tristate choice" |
||||
default TRI_CHOICE1 |
||||
|
||||
config TRI_CHOICE0 |
||||
tristate "choice 0" |
||||
|
||||
config TRI_CHOICE1 |
||||
tristate "choice 1" |
||||
|
||||
endchoice |
||||
|
||||
choice |
||||
prompt "optional tristate choice" |
||||
optional |
||||
default OPT_TRI_CHOICE1 |
||||
|
||||
config OPT_TRI_CHOICE0 |
||||
tristate "choice 0" |
||||
|
||||
config OPT_TRI_CHOICE1 |
||||
tristate "choice 1" |
||||
|
||||
endchoice |
@ -0,0 +1,40 @@ |
||||
""" |
||||
Basic choice tests. |
||||
|
||||
The handling of 'choice' is a bit complicated part in Kconfig. |
||||
|
||||
The behavior of 'y' choice is intuitive. If choice values are tristate, |
||||
the choice can be 'm' where each value can be enabled independently. |
||||
Also, if a choice is marked as 'optional', the whole choice can be |
||||
invisible. |
||||
""" |
||||
|
||||
|
||||
def test_oldask0(conf): |
||||
assert conf.oldaskconfig() == 0 |
||||
assert conf.stdout_contains('oldask0_expected_stdout') |
||||
|
||||
|
||||
def test_oldask1(conf): |
||||
assert conf.oldaskconfig('oldask1_config') == 0 |
||||
assert conf.stdout_contains('oldask1_expected_stdout') |
||||
|
||||
|
||||
def test_allyes(conf): |
||||
assert conf.allyesconfig() == 0 |
||||
assert conf.config_contains('allyes_expected_config') |
||||
|
||||
|
||||
def test_allmod(conf): |
||||
assert conf.allmodconfig() == 0 |
||||
assert conf.config_contains('allmod_expected_config') |
||||
|
||||
|
||||
def test_allno(conf): |
||||
assert conf.allnoconfig() == 0 |
||||
assert conf.config_contains('allno_expected_config') |
||||
|
||||
|
||||
def test_alldef(conf): |
||||
assert conf.alldefconfig() == 0 |
||||
assert conf.config_contains('alldef_expected_config') |
@ -0,0 +1,5 @@ |
||||
CONFIG_MODULES=y |
||||
# CONFIG_BOOL_CHOICE0 is not set |
||||
CONFIG_BOOL_CHOICE1=y |
||||
# CONFIG_TRI_CHOICE0 is not set |
||||
# CONFIG_TRI_CHOICE1 is not set |
@ -0,0 +1,9 @@ |
||||
CONFIG_MODULES=y |
||||
# CONFIG_BOOL_CHOICE0 is not set |
||||
CONFIG_BOOL_CHOICE1=y |
||||
# CONFIG_OPT_BOOL_CHOICE0 is not set |
||||
CONFIG_OPT_BOOL_CHOICE1=y |
||||
CONFIG_TRI_CHOICE0=m |
||||
CONFIG_TRI_CHOICE1=m |
||||
CONFIG_OPT_TRI_CHOICE0=m |
||||
CONFIG_OPT_TRI_CHOICE1=m |
@ -0,0 +1,5 @@ |
||||
# CONFIG_MODULES is not set |
||||
# CONFIG_BOOL_CHOICE0 is not set |
||||
CONFIG_BOOL_CHOICE1=y |
||||
# CONFIG_TRI_CHOICE0 is not set |
||||
CONFIG_TRI_CHOICE1=y |
@ -0,0 +1,9 @@ |
||||
CONFIG_MODULES=y |
||||
# CONFIG_BOOL_CHOICE0 is not set |
||||
CONFIG_BOOL_CHOICE1=y |
||||
# CONFIG_OPT_BOOL_CHOICE0 is not set |
||||
CONFIG_OPT_BOOL_CHOICE1=y |
||||
# CONFIG_TRI_CHOICE0 is not set |
||||
CONFIG_TRI_CHOICE1=y |
||||
# CONFIG_OPT_TRI_CHOICE0 is not set |
||||
CONFIG_OPT_TRI_CHOICE1=y |
@ -0,0 +1,10 @@ |
||||
Enable loadable module support (MODULES) [Y/n/?] (NEW) |
||||
boolean choice |
||||
1. choice 0 (BOOL_CHOICE0) (NEW) |
||||
> 2. choice 1 (BOOL_CHOICE1) (NEW) |
||||
choice[1-2?]: |
||||
optional boolean choice [N/y/?] (NEW) |
||||
tristate choice [M/y/?] (NEW) |
||||
choice 0 (TRI_CHOICE0) [N/m/?] (NEW) |
||||
choice 1 (TRI_CHOICE1) [N/m/?] (NEW) |
||||
optional tristate choice [N/m/y/?] (NEW) |
@ -0,0 +1,2 @@ |
||||
# CONFIG_MODULES is not set |
||||
CONFIG_OPT_BOOL_CHOICE0=y |
@ -0,0 +1,15 @@ |
||||
Enable loadable module support (MODULES) [N/y/?] |
||||
boolean choice |
||||
1. choice 0 (BOOL_CHOICE0) (NEW) |
||||
> 2. choice 1 (BOOL_CHOICE1) (NEW) |
||||
choice[1-2?]: |
||||
optional boolean choice [Y/n/?] (NEW) |
||||
optional boolean choice |
||||
> 1. choice 0 (OPT_BOOL_CHOICE0) |
||||
2. choice 1 (OPT_BOOL_CHOICE1) (NEW) |
||||
choice[1-2?]: |
||||
tristate choice |
||||
1. choice 0 (TRI_CHOICE0) (NEW) |
||||
> 2. choice 1 (TRI_CHOICE1) (NEW) |
||||
choice[1-2?]: |
||||
optional tristate choice [N/y/?] |
@ -0,0 +1,19 @@ |
||||
config MODULES |
||||
def_bool y |
||||
option modules |
||||
|
||||
config DEP |
||||
tristate |
||||
default m |
||||
|
||||
choice |
||||
prompt "Tristate Choice" |
||||
|
||||
config CHOICE0 |
||||
tristate "Choice 0" |
||||
|
||||
config CHOICE1 |
||||
tristate "Choice 1" |
||||
depends on DEP |
||||
|
||||
endchoice |
@ -0,0 +1,15 @@ |
||||
""" |
||||
Hide tristate choice values with mod dependency in y choice. |
||||
|
||||
If tristate choice values depend on symbols set to 'm', they should be |
||||
hidden when the choice containing them is changed from 'm' to 'y' |
||||
(i.e. exclusive choice). |
||||
|
||||
Related Linux commit: fa64e5f6a35efd5e77d639125d973077ca506074 |
||||
""" |
||||
|
||||
|
||||
def test(conf): |
||||
assert conf.oldaskconfig('config', 'y') == 0 |
||||
assert conf.config_contains('expected_config') |
||||
assert conf.stdout_contains('expected_stdout') |
@ -0,0 +1,2 @@ |
||||
CONFIG_CHOICE0=m |
||||
CONFIG_CHOICE1=m |
@ -0,0 +1,3 @@ |
||||
CONFIG_MODULES=y |
||||
CONFIG_DEP=m |
||||
CONFIG_CHOICE0=y |
@ -0,0 +1,4 @@ |
||||
Tristate Choice [M/y/?] y |
||||
Tristate Choice |
||||
> 1. Choice 0 (CHOICE0) |
||||
choice[1]: 1 |
@ -0,0 +1,291 @@ |
||||
# SPDX-License-Identifier: GPL-2.0 |
||||
# |
||||
# Copyright (C) 2018 Masahiro Yamada <yamada.masahiro@socionext.com> |
||||
# |
||||
|
||||
""" |
||||
Kconfig unit testing framework. |
||||
|
||||
This provides fixture functions commonly used from test files. |
||||
""" |
||||
|
||||
import os |
||||
import pytest |
||||
import shutil |
||||
import subprocess |
||||
import tempfile |
||||
|
||||
CONF_PATH = os.path.abspath(os.path.join('scripts', 'kconfig', 'conf')) |
||||
|
||||
|
||||
class Conf: |
||||
"""Kconfig runner and result checker. |
||||
|
||||
This class provides methods to run text-based interface of Kconfig |
||||
(scripts/kconfig/conf) and retrieve the resulted configuration, |
||||
stdout, and stderr. It also provides methods to compare those |
||||
results with expectations. |
||||
""" |
||||
|
||||
def __init__(self, request): |
||||
"""Create a new Conf instance. |
||||
|
||||
request: object to introspect the requesting test module |
||||
""" |
||||
# the directory of the test being run |
||||
self._test_dir = os.path.dirname(str(request.fspath)) |
||||
|
||||
# runners |
||||
def _run_conf(self, mode, dot_config=None, out_file='.config', |
||||
interactive=False, in_keys=None, extra_env={}): |
||||
"""Run text-based Kconfig executable and save the result. |
||||
|
||||
mode: input mode option (--oldaskconfig, --defconfig=<file> etc.) |
||||
dot_config: .config file to use for configuration base |
||||
out_file: file name to contain the output config data |
||||
interactive: flag to specify the interactive mode |
||||
in_keys: key inputs for interactive modes |
||||
extra_env: additional environments |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
command = [CONF_PATH, mode, 'Kconfig'] |
||||
|
||||
# Override 'srctree' environment to make the test as the top directory |
||||
extra_env['srctree'] = self._test_dir |
||||
|
||||
# Run Kconfig in a temporary directory. |
||||
# This directory is automatically removed when done. |
||||
with tempfile.TemporaryDirectory() as temp_dir: |
||||
|
||||
# if .config is given, copy it to the working directory |
||||
if dot_config: |
||||
shutil.copyfile(os.path.join(self._test_dir, dot_config), |
||||
os.path.join(temp_dir, '.config')) |
||||
|
||||
ps = subprocess.Popen(command, |
||||
stdin=subprocess.PIPE, |
||||
stdout=subprocess.PIPE, |
||||
stderr=subprocess.PIPE, |
||||
cwd=temp_dir, |
||||
env=dict(os.environ, **extra_env)) |
||||
|
||||
# If input key sequence is given, feed it to stdin. |
||||
if in_keys: |
||||
ps.stdin.write(in_keys.encode('utf-8')) |
||||
|
||||
while ps.poll() is None: |
||||
# For interactive modes such as oldaskconfig, oldconfig, |
||||
# send 'Enter' key until the program finishes. |
||||
if interactive: |
||||
ps.stdin.write(b'\n') |
||||
|
||||
self.retcode = ps.returncode |
||||
self.stdout = ps.stdout.read().decode() |
||||
self.stderr = ps.stderr.read().decode() |
||||
|
||||
# Retrieve the resulted config data only when .config is supposed |
||||
# to exist. If the command fails, the .config does not exist. |
||||
# 'listnewconfig' does not produce .config in the first place. |
||||
if self.retcode == 0 and out_file: |
||||
with open(os.path.join(temp_dir, out_file)) as f: |
||||
self.config = f.read() |
||||
else: |
||||
self.config = None |
||||
|
||||
# Logging: |
||||
# Pytest captures the following information by default. In failure |
||||
# of tests, the captured log will be displayed. This will be useful to |
||||
# figure out what has happened. |
||||
|
||||
print("[command]\n{}\n".format(' '.join(command))) |
||||
|
||||
print("[retcode]\n{}\n".format(self.retcode)) |
||||
|
||||
print("[stdout]") |
||||
print(self.stdout) |
||||
|
||||
print("[stderr]") |
||||
print(self.stderr) |
||||
|
||||
if self.config is not None: |
||||
print("[output for '{}']".format(out_file)) |
||||
print(self.config) |
||||
|
||||
return self.retcode |
||||
|
||||
def oldaskconfig(self, dot_config=None, in_keys=None): |
||||
"""Run oldaskconfig. |
||||
|
||||
dot_config: .config file to use for configuration base (optional) |
||||
in_key: key inputs (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._run_conf('--oldaskconfig', dot_config=dot_config, |
||||
interactive=True, in_keys=in_keys) |
||||
|
||||
def oldconfig(self, dot_config=None, in_keys=None): |
||||
"""Run oldconfig. |
||||
|
||||
dot_config: .config file to use for configuration base (optional) |
||||
in_key: key inputs (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._run_conf('--oldconfig', dot_config=dot_config, |
||||
interactive=True, in_keys=in_keys) |
||||
|
||||
def olddefconfig(self, dot_config=None): |
||||
"""Run olddefconfig. |
||||
|
||||
dot_config: .config file to use for configuration base (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._run_conf('--olddefconfig', dot_config=dot_config) |
||||
|
||||
def defconfig(self, defconfig): |
||||
"""Run defconfig. |
||||
|
||||
defconfig: defconfig file for input |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
defconfig_path = os.path.join(self._test_dir, defconfig) |
||||
return self._run_conf('--defconfig={}'.format(defconfig_path)) |
||||
|
||||
def _allconfig(self, mode, all_config): |
||||
if all_config: |
||||
all_config_path = os.path.join(self._test_dir, all_config) |
||||
extra_env = {'KCONFIG_ALLCONFIG': all_config_path} |
||||
else: |
||||
extra_env = {} |
||||
|
||||
return self._run_conf('--{}config'.format(mode), extra_env=extra_env) |
||||
|
||||
def allyesconfig(self, all_config=None): |
||||
"""Run allyesconfig. |
||||
|
||||
all_config: fragment config file for KCONFIG_ALLCONFIG (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._allconfig('allyes', all_config) |
||||
|
||||
def allmodconfig(self, all_config=None): |
||||
"""Run allmodconfig. |
||||
|
||||
all_config: fragment config file for KCONFIG_ALLCONFIG (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._allconfig('allmod', all_config) |
||||
|
||||
def allnoconfig(self, all_config=None): |
||||
"""Run allnoconfig. |
||||
|
||||
all_config: fragment config file for KCONFIG_ALLCONFIG (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._allconfig('allno', all_config) |
||||
|
||||
def alldefconfig(self, all_config=None): |
||||
"""Run alldefconfig. |
||||
|
||||
all_config: fragment config file for KCONFIG_ALLCONFIG (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._allconfig('alldef', all_config) |
||||
|
||||
def randconfig(self, all_config=None): |
||||
"""Run randconfig. |
||||
|
||||
all_config: fragment config file for KCONFIG_ALLCONFIG (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._allconfig('rand', all_config) |
||||
|
||||
def savedefconfig(self, dot_config): |
||||
"""Run savedefconfig. |
||||
|
||||
dot_config: .config file for input |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._run_conf('--savedefconfig', out_file='defconfig') |
||||
|
||||
def listnewconfig(self, dot_config=None): |
||||
"""Run listnewconfig. |
||||
|
||||
dot_config: .config file to use for configuration base (optional) |
||||
returncode: exit status of the Kconfig executable |
||||
""" |
||||
return self._run_conf('--listnewconfig', dot_config=dot_config, |
||||
out_file=None) |
||||
|
||||
# checkers |
||||
def _read_and_compare(self, compare, expected): |
||||
"""Compare the result with expectation. |
||||
|
||||
compare: function to compare the result with expectation |
||||
expected: file that contains the expected data |
||||
""" |
||||
with open(os.path.join(self._test_dir, expected)) as f: |
||||
expected_data = f.read() |
||||
return compare(self, expected_data) |
||||
|
||||
def _contains(self, attr, expected): |
||||
return self._read_and_compare( |
||||
lambda s, e: getattr(s, attr).find(e) >= 0, |
||||
expected) |
||||
|
||||
def _matches(self, attr, expected): |
||||
return self._read_and_compare(lambda s, e: getattr(s, attr) == e, |
||||
expected) |
||||
|
||||
def config_contains(self, expected): |
||||
"""Check if resulted configuration contains expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result contains the expected data, False otherwise |
||||
""" |
||||
return self._contains('config', expected) |
||||
|
||||
def config_matches(self, expected): |
||||
"""Check if resulted configuration exactly matches expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result matches the expected data, False otherwise |
||||
""" |
||||
return self._matches('config', expected) |
||||
|
||||
def stdout_contains(self, expected): |
||||
"""Check if resulted stdout contains expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result contains the expected data, False otherwise |
||||
""" |
||||
return self._contains('stdout', expected) |
||||
|
||||
def stdout_matches(self, expected): |
||||
"""Check if resulted stdout exactly matches expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result matches the expected data, False otherwise |
||||
""" |
||||
return self._matches('stdout', expected) |
||||
|
||||
def stderr_contains(self, expected): |
||||
"""Check if resulted stderr contains expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result contains the expected data, False otherwise |
||||
""" |
||||
return self._contains('stderr', expected) |
||||
|
||||
def stderr_matches(self, expected): |
||||
"""Check if resulted stderr exactly matches expected data. |
||||
|
||||
expected: file that contains the expected data |
||||
returncode: True if result matches the expected data, False otherwise |
||||
""" |
||||
return self._matches('stderr', expected) |
||||
|
||||
|
||||
@pytest.fixture(scope="module") |
||||
def conf(request): |
||||
"""Create a Conf instance and provide it to test functions.""" |
||||
return Conf(request) |
@ -0,0 +1 @@ |
||||
source "Kconfig.inc1" |
@ -0,0 +1,4 @@ |
||||
|
||||
|
||||
|
||||
source "Kconfig.inc2" |
@ -0,0 +1,3 @@ |
||||
|
||||
|
||||
source "Kconfig.inc3" |
@ -0,0 +1 @@ |
||||
source "Kconfig.inc1" |
@ -0,0 +1,10 @@ |
||||
""" |
||||
Detect recursive inclusion error. |
||||
|
||||
If recursive inclusion is detected, it should fail with error messages. |
||||
""" |
||||
|
||||
|
||||
def test(conf): |
||||
assert conf.oldaskconfig() != 0 |
||||
assert conf.stderr_contains('expected_stderr') |
@ -0,0 +1,6 @@ |
||||
Recursive inclusion detected. |
||||
Inclusion path: |
||||
current file : Kconfig.inc1 |
||||
included from: Kconfig.inc3:1 |
||||
included from: Kconfig.inc2:3 |
||||
included from: Kconfig.inc1:4 |
@ -0,0 +1,23 @@ |
||||
config MODULES |
||||
def_bool y |
||||
option modules |
||||
|
||||
choice |
||||
prompt "Choice" |
||||
|
||||
config CHOICE_VAL0 |
||||
tristate "Choice 0" |
||||
|
||||
config CHOIVE_VAL1 |
||||
tristate "Choice 1" |
||||
|
||||
endchoice |
||||
|
||||
choice |
||||
prompt "Another choice" |
||||
depends on CHOICE_VAL0 |
||||
|
||||
config DUMMY |
||||
bool "dummy" |
||||
|
||||
endchoice |
@ -0,0 +1,14 @@ |
||||
""" |
||||
Do not affect user-assigned choice value by another choice. |
||||
|
||||
Handling of state flags for choices is complecated. In old days, |
||||
the defconfig result of a choice could be affected by another choice |
||||
if those choices interact by 'depends on', 'select', etc. |
||||
|
||||
Related Linux commit: fbe98bb9ed3dae23e320c6b113e35f129538d14a |
||||
""" |
||||
|
||||
|
||||
def test(conf): |
||||
assert conf.defconfig('defconfig') == 0 |
||||
assert conf.config_contains('expected_config') |
@ -0,0 +1 @@ |
||||
CONFIG_CHOICE_VAL0=y |
@ -0,0 +1,4 @@ |
||||
CONFIG_MODULES=y |
||||
CONFIG_CHOICE_VAL0=y |
||||
# CONFIG_CHOIVE_VAL1 is not set |
||||
CONFIG_DUMMY=y |
@ -0,0 +1,37 @@ |
||||
config A |
||||
bool "A" |
||||
help |
||||
This is a new symbol. |
||||
|
||||
choice |
||||
prompt "Choice ?" |
||||
depends on A |
||||
help |
||||
"depends on A" has been newly added. |
||||
|
||||
config CHOICE_B |
||||
bool "Choice B" |
||||
|
||||
config CHOICE_C |
||||
bool "Choice C" |
||||
help |
||||
This is a new symbol, so should be asked. |
||||
|
||||
endchoice |
||||
|
||||
choice |
||||
prompt "Choice2 ?" |
||||
|
||||
config CHOICE_D |
||||
bool "Choice D" |
||||
|
||||
config CHOICE_E |
||||
bool "Choice E" |
||||
|
||||
config CHOICE_F |
||||
bool "Choice F" |
||||
depends on A |
||||
help |
||||
This is a new symbol, so should be asked. |
||||
|
||||
endchoice |
@ -0,0 +1,14 @@ |
||||
""" |
||||
Ask new choice values when they become visible. |
||||
|
||||
If new choice values are added with new dependency, and they become |
||||
visible during user configuration, oldconfig should recognize them |
||||
as (NEW), and ask the user for choice. |
||||
|
||||
Related Linux commit: 5d09598d488f081e3be23f885ed65cbbe2d073b5 |
||||
""" |
||||
|
||||
|
||||
def test(conf): |
||||
assert conf.oldconfig('config', 'y') == 0 |
||||
assert conf.stdout_contains('expected_stdout') |
@ -0,0 +1,3 @@ |
||||
CONFIG_CHOICE_B=y |
||||
# CONFIG_CHOICE_D is not set |
||||
CONFIG_CHOICE_E=y |
@ -0,0 +1,10 @@ |
||||
A (A) [N/y/?] (NEW) y |
||||
Choice ? |
||||
> 1. Choice B (CHOICE_B) |
||||
2. Choice C (CHOICE_C) (NEW) |
||||
choice[1-2?]: |
||||
Choice2 ? |
||||
1. Choice D (CHOICE_D) |
||||
> 2. Choice E (CHOICE_E) |
||||
3. Choice F (CHOICE_F) (NEW) |
||||
choice[1-3?]: |
@ -0,0 +1,14 @@ |
||||
config A |
||||
bool "A" |
||||
|
||||
choice |
||||
prompt "Choice ?" |
||||
depends on A |
||||
|
||||
config CHOICE_B |
||||
bool "Choice B" |
||||
|
||||
config CHOICE_C |
||||
bool "Choice C" |
||||
|
||||
endchoice |
@ -0,0 +1,19 @@ |
||||
""" |
||||
Do not write choice values to .config if the dependency is unmet. |
||||
|
||||
"# CONFIG_... is not set" should not be written into the .config file |
||||
for symbols with unmet dependency. |
||||
|
||||
This was not working correctly for choice values because choice needs |
||||
a bit different symbol computation. |
||||
|
||||
This checks that no unneeded "# COFIG_... is not set" is contained in |
||||
the .config file. |
||||
|
||||
Related Linux commit: cb67ab2cd2b8abd9650292c986c79901e3073a59 |
||||
""" |
||||
|
||||
|
||||
def test(conf): |
||||
assert conf.oldaskconfig('config', 'n') == 0 |
||||
assert conf.config_matches('expected_config') |
@ -0,0 +1 @@ |
||||
CONFIG_A=y |
@ -0,0 +1,5 @@ |
||||
# |
||||
# Automatically generated file; DO NOT EDIT. |
||||
# Linux Kernel Configuration |
||||
# |
||||
# CONFIG_A is not set |
@ -0,0 +1,7 @@ |
||||
[pytest] |
||||
addopts = --verbose |
||||
|
||||
# Pytest requires that test files have unique names, because pytest imports |
||||
# them as top-level modules. It is silly to prefix or suffix a test file with |
||||
# the directory name that contains it. Use __init__.py for all test files. |
||||
python_files = __init__.py |
@ -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 |
@ -0,0 +1,16 @@ |
||||
""" |
||||
Set random values recursively in nested choices. |
||||
|
||||
Kconfig can create a choice-in-choice structure by using 'if' statement. |
||||
randconfig should correctly set random choice values. |
||||
|
||||
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')) |
@ -0,0 +1,2 @@ |
||||
CONFIG_A=y |
||||
# CONFIG_B is not set |
@ -0,0 +1,4 @@ |
||||
# CONFIG_A is not set |
||||
CONFIG_B=y |
||||
CONFIG_C=y |
||||
# CONFIG_D is not set |
@ -0,0 +1,5 @@ |
||||
# CONFIG_A is not set |
||||
CONFIG_B=y |
||||
# CONFIG_C is not set |
||||
CONFIG_D=y |
||||
CONFIG_E=y |
@ -0,0 +1,62 @@ |
||||
# depends on itself |
||||
|
||||
config A |
||||
bool "A" |
||||
depends on A |
||||
|
||||
# select itself |
||||
|
||||
config B |
||||
bool |
||||
select B |
||||
|
||||
# depends on each other |
||||
|
||||
config C1 |
||||
bool "C1" |
||||
depends on C2 |
||||
|
||||
config C2 |
||||
bool "C2" |
||||
depends on C1 |
||||
|
||||
# depends on and select |
||||
|
||||
config D1 |
||||
bool "D1" |
||||
depends on D2 |
||||
select D2 |
||||
|
||||
config D2 |
||||
bool |
||||
|
||||
# depends on and imply |
||||
# This is not recursive dependency |
||||
|
||||
config E1 |
||||
bool "E1" |
||||
depends on E2 |
||||
imply E2 |
||||
|
||||
config E2 |
||||
bool "E2" |
||||
|
||||
# property |
||||
|
||||
config F1 |
||||
bool "F1" |
||||
default F2 |
||||
|
||||
config F2 |
||||
bool "F2" |
||||
depends on F1 |
||||
|
||||
# menu |
||||
|
||||
menu "menu depending on its content" |
||||
depends on G |
||||
|
||||
config G |
||||
bool "G" |
||||
|
||||
endmenu |
@ -0,0 +1,9 @@ |
||||
""" |
||||
Warn recursive inclusion. |
||||
|
||||
Recursive dependency should be warned. |
||||
""" |
||||
|
||||
def test(conf): |
||||
assert conf.oldaskconfig() == 0 |
||||
assert conf.stderr_contains('expected_stderr') |
@ -0,0 +1,30 @@ |
||||
Kconfig:9:error: recursive dependency detected! |
||||
Kconfig:9: symbol B is selected by B |
||||
For a resolution refer to Documentation/kbuild/kconfig-language.txt |
||||
subsection "Kconfig recursive dependency limitations" |
||||
|
||||
Kconfig:3:error: recursive dependency detected! |
||||
Kconfig:3: symbol A depends on A |
||||
For a resolution refer to Documentation/kbuild/kconfig-language.txt |
||||
subsection "Kconfig recursive dependency limitations" |
||||
|
||||
Kconfig:15:error: recursive dependency detected! |
||||
Kconfig:15: symbol C1 depends on C2 |
||||
Kconfig:19: symbol C2 depends on C1 |
||||
For a resolution refer to Documentation/kbuild/kconfig-language.txt |
||||
subsection "Kconfig recursive dependency limitations" |
||||
|
||||
Kconfig:30:error: recursive dependency detected! |
||||
Kconfig:30: symbol D2 is selected by D1 |
||||
Kconfig:25: symbol D1 depends on D2 |
||||
For a resolution refer to Documentation/kbuild/kconfig-language.txt |
||||
subsection "Kconfig recursive dependency limitations" |
||||
|
||||
Kconfig:59:error: recursive dependency detected! |
||||
Kconfig:59: symbol G depends on G |
||||
For a resolution refer to Documentation/kbuild/kconfig-language.txt |
||||
subsection "Kconfig recursive dependency limitations" |
||||
|
||||
Kconfig:50:error: recursive dependency detected! |
||||
Kconfig:50: symbol F2 depends on F1 |
||||
Kconfig:48: symbol F1 default value contains F2 |
@ -1,50 +0,0 @@ |
||||
%language=ANSI-C |
||||
%define hash-function-name kconf_id_hash |
||||
%define lookup-function-name kconf_id_lookup |
||||
%define string-pool-name kconf_id_strings |
||||
%compare-strncmp |
||||
%enum |
||||
%pic |
||||
%struct-type |
||||
|
||||
struct kconf_id; |
||||
|
||||
static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len); |
||||
|
||||
%% |
||||
mainmenu, T_MAINMENU, TF_COMMAND |
||||
menu, T_MENU, TF_COMMAND |
||||
endmenu, T_ENDMENU, TF_COMMAND |
||||
source, T_SOURCE, TF_COMMAND |
||||
choice, T_CHOICE, TF_COMMAND |
||||
endchoice, T_ENDCHOICE, TF_COMMAND |
||||
comment, T_COMMENT, TF_COMMAND |
||||
config, T_CONFIG, TF_COMMAND |
||||
menuconfig, T_MENUCONFIG, TF_COMMAND |
||||
help, T_HELP, TF_COMMAND |
||||
---help---, T_HELP, TF_COMMAND |
||||
if, T_IF, TF_COMMAND|TF_PARAM |
||||
endif, T_ENDIF, TF_COMMAND |
||||
depends, T_DEPENDS, TF_COMMAND |
||||
optional, T_OPTIONAL, TF_COMMAND |
||||
default, T_DEFAULT, TF_COMMAND, S_UNKNOWN |
||||
prompt, T_PROMPT, TF_COMMAND |
||||
tristate, T_TYPE, TF_COMMAND, S_TRISTATE |
||||
def_tristate, T_DEFAULT, TF_COMMAND, S_TRISTATE |
||||
bool, T_TYPE, TF_COMMAND, S_BOOLEAN |
||||
boolean, T_TYPE, TF_COMMAND, S_BOOLEAN |
||||
def_bool, T_DEFAULT, TF_COMMAND, S_BOOLEAN |
||||
int, T_TYPE, TF_COMMAND, S_INT |
||||
hex, T_TYPE, TF_COMMAND, S_HEX |
||||
string, T_TYPE, TF_COMMAND, S_STRING |
||||
select, T_SELECT, TF_COMMAND |
||||
imply, T_IMPLY, TF_COMMAND |
||||
range, T_RANGE, TF_COMMAND |
||||
visible, T_VISIBLE, TF_COMMAND |
||||
option, T_OPTION, TF_COMMAND |
||||
on, T_ON, TF_PARAM |
||||
modules, T_OPT_MODULES, TF_OPTION |
||||
defconfig_list, T_OPT_DEFCONFIG_LIST,TF_OPTION |
||||
env, T_OPT_ENV, TF_OPTION |
||||
allnoconfig_y, T_OPT_ALLNOCONFIG_Y,TF_OPTION |
||||
%% |
@ -1,297 +0,0 @@ |
||||
/* ANSI-C code produced by gperf version 3.0.4 */ |
||||
/* Command-line: gperf -t --output-file scripts/kconfig/zconf.hash.c_shipped -a -C -E -g -k '1,3,$' -p -t scripts/kconfig/zconf.gperf */ |
||||
|
||||
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ |
||||
&& ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ |
||||
&& (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \ |
||||
&& ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \ |
||||
&& ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \ |
||||
&& ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \ |
||||
&& ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \ |
||||
&& ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \ |
||||
&& ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \ |
||||
&& ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \ |
||||
&& ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \ |
||||
&& ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \ |
||||
&& ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \ |
||||
&& ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \ |
||||
&& ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \ |
||||
&& ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \ |
||||
&& ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \ |
||||
&& ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \ |
||||
&& ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \ |
||||
&& ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \ |
||||
&& ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \ |
||||
&& ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \ |
||||
&& ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126)) |
||||
/* The character set is not based on ISO-646. */ |
||||
#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>." |
||||
#endif |
||||
|
||||
#line 10 "scripts/kconfig/zconf.gperf" |
||||
struct kconf_id; |
||||
|
||||
static const struct kconf_id *kconf_id_lookup(register const char *str, register unsigned int len); |
||||
/* maximum key range = 71, duplicates = 0 */ |
||||
|
||||
#ifdef __GNUC__ |
||||
__inline |
||||
#else |
||||
#ifdef __cplusplus |
||||
inline |
||||
#endif |
||||
#endif |
||||
static unsigned int |
||||
kconf_id_hash (register const char *str, register unsigned int len) |
||||
{ |
||||
static const unsigned char asso_values[] = |
||||
{ |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 0, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 10, 25, 25, |
||||
0, 0, 0, 5, 0, 0, 73, 73, 5, 0, |
||||
10, 5, 45, 73, 20, 20, 0, 15, 15, 73, |
||||
20, 0, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73, 73, 73, 73, 73, |
||||
73, 73, 73, 73, 73, 73 |
||||
}; |
||||
register int hval = len; |
||||
|
||||
switch (hval) |
||||
{ |
||||
default: |
||||
hval += asso_values[(unsigned char)str[2]]; |
||||
/*FALLTHROUGH*/ |
||||
case 2: |
||||
case 1: |
||||
hval += asso_values[(unsigned char)str[0]]; |
||||
break; |
||||
} |
||||
return hval + asso_values[(unsigned char)str[len - 1]]; |
||||
} |
||||
|
||||
struct kconf_id_strings_t |
||||
{ |
||||
char kconf_id_strings_str2[sizeof("if")]; |
||||
char kconf_id_strings_str3[sizeof("int")]; |
||||
char kconf_id_strings_str5[sizeof("endif")]; |
||||
char kconf_id_strings_str7[sizeof("default")]; |
||||
char kconf_id_strings_str8[sizeof("tristate")]; |
||||
char kconf_id_strings_str9[sizeof("endchoice")]; |
||||
char kconf_id_strings_str10[sizeof("---help---")]; |
||||
char kconf_id_strings_str12[sizeof("def_tristate")]; |
||||
char kconf_id_strings_str13[sizeof("def_bool")]; |
||||
char kconf_id_strings_str14[sizeof("defconfig_list")]; |
||||
char kconf_id_strings_str17[sizeof("on")]; |
||||
char kconf_id_strings_str18[sizeof("optional")]; |
||||
char kconf_id_strings_str21[sizeof("option")]; |
||||
char kconf_id_strings_str22[sizeof("endmenu")]; |
||||
char kconf_id_strings_str23[sizeof("mainmenu")]; |
||||
char kconf_id_strings_str25[sizeof("menuconfig")]; |
||||
char kconf_id_strings_str27[sizeof("modules")]; |
||||
char kconf_id_strings_str28[sizeof("allnoconfig_y")]; |
||||
char kconf_id_strings_str29[sizeof("menu")]; |
||||
char kconf_id_strings_str31[sizeof("select")]; |
||||
char kconf_id_strings_str32[sizeof("comment")]; |
||||
char kconf_id_strings_str33[sizeof("env")]; |
||||
char kconf_id_strings_str35[sizeof("range")]; |
||||
char kconf_id_strings_str36[sizeof("choice")]; |
||||
char kconf_id_strings_str39[sizeof("bool")]; |
||||
char kconf_id_strings_str41[sizeof("source")]; |
||||
char kconf_id_strings_str42[sizeof("visible")]; |
||||
char kconf_id_strings_str43[sizeof("hex")]; |
||||
char kconf_id_strings_str46[sizeof("config")]; |
||||
char kconf_id_strings_str47[sizeof("boolean")]; |
||||
char kconf_id_strings_str50[sizeof("imply")]; |
||||
char kconf_id_strings_str51[sizeof("string")]; |
||||
char kconf_id_strings_str54[sizeof("help")]; |
||||
char kconf_id_strings_str56[sizeof("prompt")]; |
||||
char kconf_id_strings_str72[sizeof("depends")]; |
||||
}; |
||||
static const struct kconf_id_strings_t kconf_id_strings_contents = |
||||
{ |
||||
"if", |
||||
"int", |
||||
"endif", |
||||
"default", |
||||
"tristate", |
||||
"endchoice", |
||||
"---help---", |
||||
"def_tristate", |
||||
"def_bool", |
||||
"defconfig_list", |
||||
"on", |
||||
"optional", |
||||
"option", |
||||
"endmenu", |
||||
"mainmenu", |
||||
"menuconfig", |
||||
"modules", |
||||
"allnoconfig_y", |
||||
"menu", |
||||
"select", |
||||
"comment", |
||||
"env", |
||||
"range", |
||||
"choice", |
||||
"bool", |
||||
"source", |
||||
"visible", |
||||
"hex", |
||||
"config", |
||||
"boolean", |
||||
"imply", |
||||
"string", |
||||
"help", |
||||
"prompt", |
||||
"depends" |
||||
}; |
||||
#define kconf_id_strings ((const char *) &kconf_id_strings_contents) |
||||
#ifdef __GNUC__ |
||||
__inline |
||||
#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__ |
||||
__attribute__ ((__gnu_inline__)) |
||||
#endif |
||||
#endif |
||||
const struct kconf_id * |
||||
kconf_id_lookup (register const char *str, register unsigned int len) |
||||
{ |
||||
enum |
||||
{ |
||||
TOTAL_KEYWORDS = 35, |
||||
MIN_WORD_LENGTH = 2, |
||||
MAX_WORD_LENGTH = 14, |
||||
MIN_HASH_VALUE = 2, |
||||
MAX_HASH_VALUE = 72 |
||||
}; |
||||
|
||||
static const struct kconf_id wordlist[] = |
||||
{ |
||||
{-1}, {-1}, |
||||
#line 26 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str2, T_IF, TF_COMMAND|TF_PARAM}, |
||||
#line 37 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str3, T_TYPE, TF_COMMAND, S_INT}, |
||||
{-1}, |
||||
#line 27 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str5, T_ENDIF, TF_COMMAND}, |
||||
{-1}, |
||||
#line 30 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str7, T_DEFAULT, TF_COMMAND, S_UNKNOWN}, |
||||
#line 32 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str8, T_TYPE, TF_COMMAND, S_TRISTATE}, |
||||
#line 20 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str9, T_ENDCHOICE, TF_COMMAND}, |
||||
#line 25 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str10, T_HELP, TF_COMMAND}, |
||||
{-1}, |
||||
#line 33 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str12, T_DEFAULT, TF_COMMAND, S_TRISTATE}, |
||||
#line 36 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str13, T_DEFAULT, TF_COMMAND, S_BOOLEAN}, |
||||
#line 47 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str14, T_OPT_DEFCONFIG_LIST,TF_OPTION}, |
||||
{-1}, {-1}, |
||||
#line 45 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str17, T_ON, TF_PARAM}, |
||||
#line 29 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str18, T_OPTIONAL, TF_COMMAND}, |
||||
{-1}, {-1}, |
||||
#line 44 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str21, T_OPTION, TF_COMMAND}, |
||||
#line 17 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str22, T_ENDMENU, TF_COMMAND}, |
||||
#line 15 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str23, T_MAINMENU, TF_COMMAND}, |
||||
{-1}, |
||||
#line 23 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str25, T_MENUCONFIG, TF_COMMAND}, |
||||
{-1}, |
||||
#line 46 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str27, T_OPT_MODULES, TF_OPTION}, |
||||
#line 49 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str28, T_OPT_ALLNOCONFIG_Y,TF_OPTION}, |
||||
#line 16 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str29, T_MENU, TF_COMMAND}, |
||||
{-1}, |
||||
#line 40 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str31, T_SELECT, TF_COMMAND}, |
||||
#line 21 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str32, T_COMMENT, TF_COMMAND}, |
||||
#line 48 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str33, T_OPT_ENV, TF_OPTION}, |
||||
{-1}, |
||||
#line 42 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str35, T_RANGE, TF_COMMAND}, |
||||
#line 19 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str36, T_CHOICE, TF_COMMAND}, |
||||
{-1}, {-1}, |
||||
#line 34 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str39, T_TYPE, TF_COMMAND, S_BOOLEAN}, |
||||
{-1}, |
||||
#line 18 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str41, T_SOURCE, TF_COMMAND}, |
||||
#line 43 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str42, T_VISIBLE, TF_COMMAND}, |
||||
#line 38 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str43, T_TYPE, TF_COMMAND, S_HEX}, |
||||
{-1}, {-1}, |
||||
#line 22 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str46, T_CONFIG, TF_COMMAND}, |
||||
#line 35 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str47, T_TYPE, TF_COMMAND, S_BOOLEAN}, |
||||
{-1}, {-1}, |
||||
#line 41 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str50, T_IMPLY, TF_COMMAND}, |
||||
#line 39 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str51, T_TYPE, TF_COMMAND, S_STRING}, |
||||
{-1}, {-1}, |
||||
#line 24 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str54, T_HELP, TF_COMMAND}, |
||||
{-1}, |
||||
#line 31 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str56, T_PROMPT, TF_COMMAND}, |
||||
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, {-1}, |
||||
{-1}, {-1}, {-1}, {-1}, {-1}, {-1}, |
||||
#line 28 "scripts/kconfig/zconf.gperf" |
||||
{(int)(long)&((struct kconf_id_strings_t *)0)->kconf_id_strings_str72, T_DEPENDS, TF_COMMAND} |
||||
}; |
||||
|
||||
if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) |
||||
{ |
||||
register int key = kconf_id_hash (str, len); |
||||
|
||||
if (key <= MAX_HASH_VALUE && key >= 0) |
||||
{ |
||||
register int o = wordlist[key].name; |
||||
if (o >= 0) |
||||
{ |
||||
register const char *s = o + kconf_id_strings; |
||||
|
||||
if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0') |
||||
return &wordlist[key]; |
||||
} |
||||
} |
||||
} |
||||
return 0; |
||||
} |
||||
#line 50 "scripts/kconfig/zconf.gperf" |
||||
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in new issue