From 29ba63d3366cf9534909b679c0e5d4f8e66a3d69 Mon Sep 17 00:00:00 2001 From: Enrico Granata Date: Fri, 3 Oct 2014 01:54:10 +0000 Subject: [PATCH] Stop enabling the std::vector data formatter for libstdc++, and for that matter, also skip running the test on Darwin. libstdc++ is more relevant on non-Apple platforms llvm-svn: 218952 --- lldb/source/DataFormatters/FormatManager.cpp | 7 ------- .../libstdcpp/vbool/TestDataFormatterStdVBool.py | 2 ++ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp index f7f17224e9ae..723e6c70cf3f 100644 --- a/lldb/source/DataFormatters/FormatManager.cpp +++ b/lldb/source/DataFormatters/FormatManager.cpp @@ -1028,13 +1028,6 @@ FormatManager::LoadLibStdcppFormatters() AddCXXSynthetic(gnu_category_sp, lldb_private::formatters::LibStdcppVectorIteratorSyntheticFrontEndCreator, "std::vector iterator synthetic children", ConstString("^__gnu_cxx::__normal_iterator<.+>$"), stl_synth_flags, true); AddCXXSynthetic(gnu_category_sp, lldb_private::formatters::LibstdcppMapIteratorSyntheticFrontEndCreator, "std::map iterator synthetic children", ConstString("^std::_Rb_tree_iterator<.+>$"), stl_synth_flags, true); - - gnu_category_sp->GetTypeSummariesContainer()->Add(ConstString("std::vector >"), - TypeSummaryImplSP(new StringSummaryFormat(stl_summary_flags, "size=${svar%#}"))); - - gnu_category_sp->GetTypeSyntheticsContainer()->Add(ConstString("std::vector >"), - SyntheticChildrenSP(new CXXSyntheticChildren(stl_synth_flags,"libc++ std::vector synthetic children",lldb_private::formatters::LibstdcppVectorBoolSyntheticFrontEndCreator))); - #endif } diff --git a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py index ed3e24b67acb..04a75b96800e 100644 --- a/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py +++ b/lldb/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py @@ -14,6 +14,7 @@ class StdVBoolDataFormatterTestCase(TestBase): @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin") @dsym_test + @skipIfDarwin def test_with_dsym_and_run_command(self): """Test data formatter commands.""" self.buildDsym() @@ -21,6 +22,7 @@ class StdVBoolDataFormatterTestCase(TestBase): @expectedFailureFreeBSD("llvm.org/pr20548") # fails to build on lab.llvm.org buildbot @dwarf_test + @skipIfDarwin def test_with_dwarf_and_run_command(self): """Test data formatter commands.""" self.buildDwarf()