[lldb] review changes.

Author: da-viper

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

@@ -2,8 +2,7 @@
 Test lldb data formatter subsystem.
 """
 
-from typing import override
-from lldbsuite.test.decorators import add_test_categories, expectedFailureAll
+from lldbsuite.test.decorators import add_test_categories, expectedFailureAll, skip
 from lldbsuite.test.lldbtest import (
     CURRENT_EXECUTABLE_SET,
     RUN_SUCCEEDED,
@@ -23,16 +22,14 @@ def setUp(self):
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
-    @override
     def test_with_run_command(self):
         build_args = {"EXE": "a.out"}
         self.with_run_command("", build_args)
 
     @add_test_categories(["libstdcxx"])
     @expectedFailureAll(bugnumber="llvm.org/pr50861", compiler="gcc")
-    @override
     def test_with_run_command_debug(self):
-        build_args = {"_GLIBCXX_DEBUG": 1, "EXE": "debug_a.out"}
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG", "EXE": "debug_a.out"}
         self.with_run_command("__debug::", build_args)
 
     def with_run_command(self, namespace: str, dictionary: dict):
@@ -68,10 +65,13 @@ def cleanup():
 
         self.runCmd("frame variable ii --show-types")
 
+        match = f"std::{namespace}map<"
         self.runCmd(
-            f'type summary add -x "std::{namespace}map<" --summary-string "map has ${{svar%#}} items" -e'
+            f'type summary add -x "{match}" --summary-string "map has ${{svar%#}} items" -e'
         )
 
+        # self.assertFalse(True, match)
+        # self.expect("frame variable -D 0  --raw ii", substrs=["boom"])
         self.expect("frame variable ii", substrs=["map has 0 items", "{}"])
 
         self.runCmd("c")

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

@@ -27,7 +27,7 @@ def test_with_run_command(self):
 
     @add_test_categories(["libstdcxx"])
     def test_with_run_command_debug(self):
-        build_args = {"EXE": "debug_a.out", "_GLIBCXX_DEBUG": 1}
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG", "EXE": "debug_a.out"}
         self.with_run_command(build_args)
 
     def with_run_command(self, dictionary: dict):

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

@@ -29,7 +29,7 @@ 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 = {"_GLIBCXX_DEBUG": 1, "EXE": "debug_a.out"}
+        build_args = {"CXXFLAGS": "-D_GLIBCXX_DEBUG", "EXE": "debug_a.out"}
         self.with_run_command(build_args)
 
     def with_run_command(self, dictionary: dict):