diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -1664,14 +1664,16 @@ # If any debug info categories were explicitly tagged, assume that list to be # authoritative. If none were specified, try with all debug # info formats. - all_dbginfo_categories = set(test_categories.debug_info_categories) + all_dbginfo_categories = set(test_categories.debug_info_categories.values()) categories = set( getattr( attrvalue, "categories", [])) & all_dbginfo_categories if not categories: - categories = all_dbginfo_categories + categories = [category for category, can_replicate \ + in test_categories.debug_info_categories.items() \ + if can_replicate] for cat in categories: @decorators.add_test_categories([cat]) diff --git a/lldb/packages/Python/lldbsuite/test/test_categories.py b/lldb/packages/Python/lldbsuite/test/test_categories.py --- a/lldb/packages/Python/lldbsuite/test/test_categories.py +++ b/lldb/packages/Python/lldbsuite/test/test_categories.py @@ -13,10 +13,14 @@ # LLDB modules from lldbsuite.support import gmodules - -debug_info_categories = [ - 'dwarf', 'dwo', 'dsym', 'gmodules' -] +# Key: Category name +# Value: should be used in lldbtest's debug-info replication +debug_info_categories = { + 'dwarf' : True, + 'dwo' : True, + 'dsym' : True, + 'gmodules' : False +} all_categories = { 'basic_process': 'Basic process execution sniff tests.',