diff options
| author | Tom Rini <trini@konsulko.com> | 2026-02-27 09:26:13 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2026-02-27 12:27:39 -0600 |
| commit | 8d636eae30510be0cd2f3a20cbf6d06dc80413d8 (patch) | |
| tree | 504cd1453fe3d619f1cdeaf0fb7f05f0576c234a /scripts/kconfig/tests | |
| parent | 37b4e7e9e433e32e2d40226c76b8cd09eefb01ab (diff) | |
resync with 6.1CHECK/resync-scripts-kconfig
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'scripts/kconfig/tests')
| -rw-r--r-- | scripts/kconfig/tests/choice/Kconfig | 2 | ||||
| -rw-r--r-- | scripts/kconfig/tests/choice_value_with_m_dep/Kconfig | 2 | ||||
| -rw-r--r-- | scripts/kconfig/tests/conftest.py | 4 | ||||
| -rw-r--r-- | scripts/kconfig/tests/inter_choice/Kconfig | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/scripts/kconfig/tests/choice/Kconfig b/scripts/kconfig/tests/choice/Kconfig index a412205b1b0..0930eb65e93 100644 --- a/scripts/kconfig/tests/choice/Kconfig +++ b/scripts/kconfig/tests/choice/Kconfig @@ -2,7 +2,7 @@ config MODULES bool "Enable loadable module support" - option modules + modules default y choice diff --git a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig index 7106c26bb3a..bd970cec07d 100644 --- a/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig +++ b/scripts/kconfig/tests/choice_value_with_m_dep/Kconfig @@ -2,7 +2,7 @@ config MODULES def_bool y - option modules + modules config DEP tristate diff --git a/scripts/kconfig/tests/conftest.py b/scripts/kconfig/tests/conftest.py index 0345ef6e327..af8774a5697 100644 --- a/scripts/kconfig/tests/conftest.py +++ b/scripts/kconfig/tests/conftest.py @@ -53,6 +53,10 @@ class Conf: # Override 'srctree' environment to make the test as the top directory extra_env['srctree'] = self._test_dir + # Clear KCONFIG_DEFCONFIG_LIST to keep unit tests from being affected + # by the user's environment. + extra_env['KCONFIG_DEFCONFIG_LIST'] = '' + # Run Kconfig in a temporary directory. # This directory is automatically removed when done. with tempfile.TemporaryDirectory() as temp_dir: diff --git a/scripts/kconfig/tests/inter_choice/Kconfig b/scripts/kconfig/tests/inter_choice/Kconfig index 5698a4018dd..26c25f68695 100644 --- a/scripts/kconfig/tests/inter_choice/Kconfig +++ b/scripts/kconfig/tests/inter_choice/Kconfig @@ -2,7 +2,7 @@ config MODULES def_bool y - option modules + modules choice prompt "Choice" |