[lldb] use CXXFLAGS_EXTRAS

Author: da-viper

lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp

@@ -1740,7 +1740,7 @@ lldb::TypeCategoryImplSP CPlusPlusLanguage::GetFormatters() {
       // NOTE: the libstdcpp formatters are loaded after libcxx formatters
       // because we don't want to the libcxx formatters to match the potential
       // `__debug` inline namespace that libstdcpp may use. since LLDB
-      // priorities the last loaded matching formatter.
+      // prioritizes the last loaded matching formatter.
       LoadLibCxxFormatters(g_category);
       LoadLibStdcppFormatters(g_category);
       LoadSystemFormatters(g_category);

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py

@@ -19,13 +19,12 @@ def setUp(self):
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
     def test_with_run_command(self):
-        build_args = {"EXE": "a.out"}
-        self.with_run_command("", build_args)
+        self.with_run_command("", {})
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
     def test_with_run_command_debug(self):
-        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG", "EXE": "debug_a.out"}
+        build_args = {"CXXFLAGS_EXTRAS": "-D_GLIBCXX_DEBUG"}
         self.with_run_command("__debug::", build_args)
 
     def with_run_command(self, namespace: str, dictionary: dict):
@@ -64,7 +63,6 @@ def cleanup():
 
         match = f"std::{namespace}map<"
         self.runCmd(
-            'type summary add -x "std::map<" --summary-string "map has ${svar%#} items" -e'
             f'type summary add -x "{match}" --summary-string "map has ${{svar%#}} items" -e'
         )
 

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py

@@ -16,20 +16,20 @@ def setUp(self):
         # Find the line number to break at.
         self.line = line_number("main.cpp", "// Set break point at this line.")
 
+    @skip
     @add_test_categories(["libstdcxx"])
     def test_with_run_command(self):
         self.with_run_command({})
 
     @add_test_categories(["libstdcxx"])
     def test_with_run_command_debug(self):
-        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG"}
+        build_args = {"CXXFLAGS_EXTRAS": "-D_GLIBCXX_DEBUG"}
         self.with_run_command(build_args)
 
     def with_run_command(self, dictionary: dict):
         """Test that that file and class static variables display correctly."""
         self.build(dictionary=dictionary)
         artifact_name = dictionary.get("EXE", "a.out")
-        self.runCmd("file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET)
         self.runCmd(
             "file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET
         )

lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py

@@ -24,14 +24,16 @@ def test_with_run_command(self):
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
     def test_with_run_command_debug(self):
-        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG"}
+        build_args = {"CXXFLAGS_EXTRAS": "-D_GLIBCXX_DEBUG"}
         self.with_run_command(build_args)
 
     def with_run_command(self, dictionary: dict):
         """Test that that file and class static variables display correctly."""
         self.build(dictionary=dictionary)
         artifact_name = "a.out"
-        self.runCmd("file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET)
+        self.runCmd(
+            "file " + self.getBuildArtifact(artifact_name), CURRENT_EXECUTABLE_SET
+        )
 
         lldbutil.run_break_set_by_source_regexp(self, "Set break point at this line.")