diff options
| author |   Daniel Latypov <dlatypov@google.com> | 2020-12-08 15:21:02 -0800 |
|---|---|---|
| committer |   Shuah Khan <skhan@linuxfoundation.org> | 2021-02-08 15:38:55 -0700 |
| commit | d3bae4a0b6e1bfbfcff3dbc2a6d96a505e31677e (patch) | |
| tree | a5ce80efff581ab42471ef7b44da91896f97f557 /tools/testing/kunit/kunit_config.py | |
| parent | minor: kunit: tool: fix unit test so it can run from non-root dir (diff) | |
| download | linux-dev-d3bae4a0b6e1bfbfcff3dbc2a6d96a505e31677e.tar.xz linux-dev-d3bae4a0b6e1bfbfcff3dbc2a6d96a505e31677e.zip | |
kunit: tool: simplify kconfig is_subset_of() logic
Don't use an O(nm) algorithm* and make it more readable by using a dict.
*Most obviously, it does a nested for-loop over the entire other config.
A bit more subtle, it calls .entries(), which constructs a set from the
list for _every_ outer iteration.
Signed-off-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: David Gow <davidgow@google.com>
Tested-by: Brendan Higgins <brendanhiggins@google.com>
Acked-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools/testing/kunit/kunit_config.py')
| -rw-r--r-- | tools/testing/kunit/kunit_config.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tools/testing/kunit/kunit_config.py b/tools/testing/kunit/kunit_config.py index bdd60230764b..0b550cbd667d 100644 --- a/tools/testing/kunit/kunit_config.py +++ b/tools/testing/kunit/kunit_config.py @@ -41,15 +41,14 @@ class Kconfig(object): self._entries.append(entry) def is_subset_of(self, other: 'Kconfig') -> bool: + other_dict = {e.name: e.value for e in other.entries()} for a in self.entries(): - found = False - for b in other.entries(): - if a.name != b.name: + b = other_dict.get(a.name) + if b is None: + if a.value == 'n': continue - if a.value != b.value: - return False - found = True - if a.value != 'n' and found == False: + return False + elif a.value != b: return False return True |