From b40a947c533c9560fefa19eef991caa2eeb93614 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Tue, 31 Oct 2017 01:14:09 +0100 Subject: Handle choices more like the C implementation Choice symbols get the choice itself propagated to the conditions of their properties. This works since the Symbol/Choice value interfaces are compatible now. Simplifies value calculations and makes .assignable work automagically for choice symbols in choices in any mode. One drawback is that a '&& ' now shows up on conditions when printing choice symbols, which is not valid Kconfig. That should be easy to work around if needed at least. --- testsuite.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'testsuite.py') diff --git a/testsuite.py b/testsuite.py index fa10a39..e6d77e3 100644 --- a/testsuite.py +++ b/testsuite.py @@ -644,7 +644,7 @@ choice """) verify_repr(c.syms["CHOICE_1"], """ - + """) verify_repr(c.modules, """ @@ -1590,8 +1590,8 @@ g verify_mode(choice_bool_opt, 0, 0) verify_mode(choice_tristate, 2, 1) verify_mode(choice_tristate_opt, 0, 0) - verify_mode(choice_bool_m, 2, 2) - verify_mode(choice_tristate_m, 2, 1) + verify_mode(choice_bool_m, 0, 2) + verify_mode(choice_tristate_m, 0, 1) # Test defaults @@ -1772,13 +1772,13 @@ def run_compatibility_tests(): # (generated by us) after each invocation. all_arch_tests = ((test_load, False), (test_alldefconfig, True), + # Needs to report success/failure for each arch/defconfig + # combo, hence False. (test_defconfig, False), (test_sanity, False), (test_all_no, True), (test_all_no_simpler, True), (test_all_yes, True)) - # Needs to report success/failure for each arch/defconfig - # combo, hence False. arch_srcarch_list = get_arch_srcarch_list() -- cgit v1.2.3