Revert ""
authorJan Kratochvil <jan.kratochvil@redhat.com>
Sun, 8 Nov 2020 20:34:45 +0000 (21:34 +0100)
committerJan Kratochvil <jan.kratochvil@redhat.com>
Sun, 8 Nov 2020 20:34:45 +0000 (21:34 +0100)
This reverts commit 82e523e2e256ac5715a26fd04e482ec2537df378.

lldb/packages/Python/lldbsuite/test/builders/builder.py
lldb/packages/Python/lldbsuite/test/lldbinline.py
lldb/packages/Python/lldbsuite/test/lldbtest.py
lldb/packages/Python/lldbsuite/test/make/Makefile.rules
lldb/packages/Python/lldbsuite/test/test_categories.py
lldb/test/API/lang/cpp/template-function/TestTemplateFunctions.py

index da5b040..41d55ab 100644 (file)
@@ -238,31 +238,6 @@ class Builder:
         # False signifies that we cannot handle building with dSYM.
         return False
 
-    def buildDTS(self,
-                 sender=None,
-                 architecture=None,
-                 compiler=None,
-                 dictionary=None,
-                 testdir=None,
-                 testname=None):
-        """Build the binaries with DTS - a DWARF optimization tool."""
-        commands = []
-        commands.append(
-            self.getMake(testdir, testname) + [
-                "MAKE_DSYM=NO", "DTS=YES",
-                self.getArchCFlags(architecture),
-                self.getArchSpec(architecture),
-                self.getCCSpec(compiler),
-                self.getExtraMakeArgs(),
-                self.getSDKRootSpec(),
-                self.getModuleCacheSpec(),
-                self.getCmdLine(dictionary)
-            ])
-
-        self.runBuildCommands(commands, sender=sender)
-        # True signifies that we can handle building with DTS.
-        return True
-
     def buildDWZ(self,
                  sender=None,
                  architecture=None,
index e1e7263..fb81589 100644 (file)
@@ -120,14 +120,6 @@ class InlineTest(TestBase):
         self.build(dictionary=self._build_dict)
         self.do_test()
 
-    @add_test_categories(["dts"])
-    def __test_with_dts(self):
-        self.using_dsym = False
-        self.BuildMakefile()
-        self.build()
-        self.do_test()
-    __test_with_dts.debug_info = "dts"
-
     @add_test_categories(["dwz"])
     def __test_with_dwz(self):
         self.using_dsym = False
index 14870d4..15349e9 100644 (file)
@@ -1671,23 +1671,6 @@ class Base(unittest2.TestCase):
                                     dictionary, testdir, testname):
             raise Exception("Don't know how to build binary with gmodules")
 
-    def buildDTS(
-            self,
-            architecture=None,
-            compiler=None,
-            dictionary=None):
-        """Platform specific way to build binaries with dts optimizer."""
-        testdir = self.mydir
-        testname = self.getBuildDirBasename()
-        if self.getDebugInfo() != "dts":
-            raise Exception("NO_DEBUG_INFO_TESTCASE must build with buildDefault")
-
-        module = builder_module()
-        dictionary = lldbplatformutil.finalize_build_dictionary(dictionary)
-        if not module.buildDTS(self, architecture, compiler,
-                               dictionary, testdir, testname):
-            raise Exception("Don't know how to build binary with dts")
-
     def buildDWZ(
             self,
             architecture=None,
@@ -2659,8 +2642,6 @@ FileCheck output:
             return self.buildDwo(architecture, compiler, dictionary)
         elif self.getDebugInfo() == "gmodules":
             return self.buildGModules(architecture, compiler, dictionary)
-        elif self.getDebugInfo() == "dts":
-            return self.buildDTS(architecture, compiler, dictionary)
         elif self.getDebugInfo() == "dwz":
             return self.buildDWZ(architecture, compiler, dictionary)
         else:
index 0f5ab9d..d95290e 100644 (file)
@@ -26,7 +26,6 @@
 # SPLIT_DEBUG_SYMBOLS := YES
 # CROSS_COMPILE :=
 # USE_PRIVATE_MODULE_CACHE := YES
-# DTS := YES
 # DWZ := YES
 #
 # And test/functionalities/archives/Makefile:
@@ -261,11 +260,6 @@ ifeq "$(MAKE_DWO)" "YES"
        CFLAGS += -gsplit-dwarf
 endif
 
-ifeq "$(DTS)" "YES"
-       CFLAGS += -fdebug-types-section
-       CXXFLAGS += -fdebug-types-section
-endif
-
 ifeq "$(USE_PRIVATE_MODULE_CACHE)" "YES"
 THE_CLANG_MODULE_CACHE_DIR := $(BUILDDIR)/private-module-cache
 else
index 01ad15d..8f02a70 100644 (file)
@@ -15,7 +15,7 @@ from lldbsuite.support import gmodules
 
 
 debug_info_categories = [
-    'dwarf', 'dwo', 'dsym', 'gmodules', 'dts', 'dwz'
+    'dwarf', 'dwo', 'dsym', 'gmodules', 'dwz'
 ]
 
 all_categories = {
@@ -26,7 +26,6 @@ all_categories = {
     'dsym': 'Tests that can be run with DSYM debug information',
     'dwarf': 'Tests that can be run with DWARF debug information',
     'dwo': 'Tests that can be run with DWO debug information',
-    'dts': 'Tests using -fdebug-types-section',
     'dwz': 'Tests using DWZ and its DWARF partial units',
     'dyntype': 'Tests related to dynamic type support',
     'expression': 'Tests related to the expression parser',
index 8939951..f211275 100644 (file)
@@ -53,6 +53,6 @@ class TemplateFunctionsTestCase(TestBase):
         self.do_test_template_function(True)
 
     @skipIfWindows
-    @expectedFailureAll(debug_info=["dwarf", "gmodules", "dwo", "dts", "dwz"])
+    @expectedFailureAll(debug_info=["dwarf", "gmodules", "dwo", "dwz"])
     def test_template_function_without_cast(self):
         self.do_test_template_function(False)