Michael137 created this revision.
Herald added a project: All.
Michael137 requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D134345
Files:
lldb/packages/Python/lldbsuite/test/builders/builder.py
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
lldb/packages/Python/lldbsuite/test/test_categories.py
Index: lldb/packages/Python/lldbsuite/test/test_categories.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/test_categories.py
+++ lldb/packages/Python/lldbsuite/test/test_categories.py
@@ -10,12 +10,8 @@
# Third-party modules
-# LLDB modules
-from lldbsuite.support import gmodules
-
-
debug_info_categories = [
- 'dwarf', 'dwo', 'dsym', 'gmodules'
+ 'dwarf', 'dwo', 'dsym'
]
all_categories = {
@@ -30,7 +26,6 @@
'expression': 'Tests related to the expression parser',
'flakey': 'Flakey test cases, i.e. tests that do not reliably pass at each
execution',
'fork': 'Tests requiring the process plugin fork/vfork event support',
- 'gmodules': 'Tests that can be run with -gmodules debug information',
'instrumentation-runtime': 'Tests for the instrumentation runtime plugins',
'libc++': 'Test for libc++ data formatters',
'libstdcxx': 'Test for libstdcxx data formatters',
@@ -62,11 +57,6 @@
return platform in ["linux", "freebsd"]
elif category == "dsym":
return platform in ["darwin", "macosx", "ios", "watchos", "tvos",
"bridgeos"]
- elif category == "gmodules":
- # First, check to see if the platform can even support gmodules.
- if platform not in ["darwin", "macosx", "ios", "watchos", "tvos",
"bridgeos"]:
- return False
- return gmodules.is_compiler_clang_with_gmodules(compiler_path)
return True
Index: lldb/packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -544,7 +544,9 @@
$(DSYM) : $(EXE)
ifeq "$(OS)" "Darwin"
ifneq "$(MAKE_DSYM)" "NO"
+ifneq "$(MAKE_GMODULES)" "YES"
"$(DS)" $(DSFLAGS) -o "$(DSYM)" "$(EXE)"
+endif
else
endif
else
@@ -587,10 +589,12 @@
$(CODESIGN) -s - "$(DYLIB_FILENAME)"
endif
ifneq "$(MAKE_DSYM)" "NO"
+ifneq "$(MAKE_GMODULES)" "YES"
ifneq "$(DS)" ""
"$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)"
endif
endif
+endif
else
$(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
Index: lldb/packages/Python/lldbsuite/test/builders/builder.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -133,8 +133,6 @@
return ["MAKE_DSYM=NO"]
if debug_info == "dwo":
return ["MAKE_DSYM=NO", "MAKE_DWO=YES"]
- if debug_info == "gmodules":
- return ["MAKE_DSYM=NO", "MAKE_GMODULES=YES"]
return None
def getBuildCommand(self, debug_info, architecture=None, compiler=None,
Index: lldb/packages/Python/lldbsuite/test/test_categories.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/test_categories.py
+++ lldb/packages/Python/lldbsuite/test/test_categories.py
@@ -10,12 +10,8 @@
# Third-party modules
-# LLDB modules
-from lldbsuite.support import gmodules
-
-
debug_info_categories = [
- 'dwarf', 'dwo', 'dsym', 'gmodules'
+ 'dwarf', 'dwo', 'dsym'
]
all_categories = {
@@ -30,7 +26,6 @@
'expression': 'Tests related to the expression parser',
'flakey': 'Flakey test cases, i.e. tests that do not reliably pass at each execution',
'fork': 'Tests requiring the process plugin fork/vfork event support',
- 'gmodules': 'Tests that can be run with -gmodules debug information',
'instrumentation-runtime': 'Tests for the instrumentation runtime plugins',
'libc++': 'Test for libc++ data formatters',
'libstdcxx': 'Test for libstdcxx data formatters',
@@ -62,11 +57,6 @@
return platform in ["linux", "freebsd"]
elif category == "dsym":
return platform in ["darwin", "macosx", "ios", "watchos", "tvos", "bridgeos"]
- elif category == "gmodules":
- # First, check to see if the platform can even support gmodules.
- if platform not in ["darwin", "macosx", "ios", "watchos", "tvos", "bridgeos"]:
- return False
- return gmodules.is_compiler_clang_with_gmodules(compiler_path)
return True
Index: lldb/packages/Python/lldbsuite/test/make/Makefile.rules
===================================================================
--- lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -544,7 +544,9 @@
$(DSYM) : $(EXE)
ifeq "$(OS)" "Darwin"
ifneq "$(MAKE_DSYM)" "NO"
+ifneq "$(MAKE_GMODULES)" "YES"
"$(DS)" $(DSFLAGS) -o "$(DSYM)" "$(EXE)"
+endif
else
endif
else
@@ -587,10 +589,12 @@
$(CODESIGN) -s - "$(DYLIB_FILENAME)"
endif
ifneq "$(MAKE_DSYM)" "NO"
+ifneq "$(MAKE_GMODULES)" "YES"
ifneq "$(DS)" ""
"$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)"
endif
endif
+endif
else
$(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"
Index: lldb/packages/Python/lldbsuite/test/builders/builder.py
===================================================================
--- lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -133,8 +133,6 @@
return ["MAKE_DSYM=NO"]
if debug_info == "dwo":
return ["MAKE_DSYM=NO", "MAKE_DWO=YES"]
- if debug_info == "gmodules":
- return ["MAKE_DSYM=NO", "MAKE_GMODULES=YES"]
return None
def getBuildCommand(self, debug_info, architecture=None, compiler=None,
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
