Author: vharron Date: Sun May 3 21:56:32 2015 New Revision: 236401 URL: http://llvm.org/viewvc/llvm-project?rev=236401&view=rev Log: Enabled libc++ formatter tests on Linux
Refactored TestInitializerList to not be an inline test. Refactored Makefiles to use USE_LIBCPP instead of adding FLAGS directly Fixed copy/paste error in TestDataFormatterUnordered class name Differenttial Revision: http://reviews.llvm.org/D9426 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py lldb/trunk/test/lldbtest.py lldb/trunk/test/make/Makefile.rules Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py Sun May 3 21:56:32 2015 @@ -1,6 +1,57 @@ -import lldbinline +""" +Test lldb data formatter subsystem. +""" + +import os, time +import unittest2 +import lldb from lldbtest import * +import lldbutil + +class InitializerListTestCase(TestBase): + + mydir = TestBase.compute_mydir(__file__) + + @skipUnlessDarwin + @dsym_test + def test_with_dsym(self): + """Test data formatter commands.""" + self.buildDsym() + self.data_formatter_commands() + + @skipIfWindows # libc++ not ported to Windows yet + @skipIfGcc + @expectedFailureLinux # fails on clang 3.5 and tot + @dwarf_test + def test_with_dwarf(self): + """Test data formatter commands.""" + self.buildDwarf() + self.data_formatter_commands() + + def setUp(self): + # Call super's setUp(). + TestBase.setUp(self) + + def data_formatter_commands(self): + """Test that that file and class static variables display correctly.""" + self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) + + bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) + + self.runCmd("run", RUN_SUCCEEDED) + + # The stop reason of the thread should be breakpoint. + self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, + substrs = ['stopped', + 'stop reason = breakpoint']) + + self.expect("frame variable ili", substrs = ['[1] = 2','[4] = 5']) + self.expect("frame variable ils", substrs = ['[4] = "surprise it is a long string!! yay!!"']) + + self.expect('image list', substrs = self.getLibcPlusPlusLibs()) -# added decorator to mark as XFAIL for Linux -# non-core functionality, need to reenable and fix later (DES 2014.11.07) -lldbinline.MakeInlineTest(__file__, globals(),expectedFailureLinux) +if __name__ == '__main__': + import atexit + lldb.SBDebugger.Initialize() + atexit.register(lambda: lldb.SBDebugger.Terminate()) + unittest2.main() Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/main.cpp Sun May 3 21:56:32 2015 @@ -16,6 +16,6 @@ int main () std::initializer_list<int> ili{1,2,3,4,5}; std::initializer_list<std::string> ils{"1","2","3","4","surprise it is a long string!! yay!!"}; - return 0; //% self.expect("frame variable ili", substrs = ['[1] = 2','[4] = 5']) - //% self.expect("frame variable ils", substrs = ['[4] = "surprise it is a long string!! yay!!"']) + return 0; // Set break point at this line. } + Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxIteratorDataFormatterTestCas self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxListDataFormatterTestCase(Te self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/Makefile Sun May 3 21:56:32 2015 @@ -2,4 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxMapDataFormatterTestCase(Tes self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/Makefile Sun May 3 21:56:32 2015 @@ -2,4 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py Sun May 3 21:56:32 2015 @@ -19,8 +19,8 @@ class LibcxxMultiMapDataFormatterTestCas self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now @skipIfWindows # libc++ not ported to Windows yet + @skipIfGcc @dwarf_test def test_with_dwarf_and_run_command(self): """Test data formatter commands.""" Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxMultiSetDataFormatterTestCas self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxSetDataFormatterTestCase(Tes self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py Sun May 3 21:56:32 2015 @@ -20,7 +20,7 @@ class LibcxxStringDataFormatterTestCase( self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -std=c++11 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py Sun May 3 21:56:32 2015 @@ -8,7 +8,7 @@ import lldb from lldbtest import * import lldbutil -class LibcxxMultiMapDataFormatterTestCase(TestBase): +class LibcxxUnorderedDataFormatterTestCase(TestBase): mydir = TestBase.compute_mydir(__file__) @@ -19,8 +19,8 @@ class LibcxxMultiMapDataFormatterTestCas self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now @dwarf_test + @skipIfGcc def test_with_dwarf_and_run_command(self): """Test data formatter commands.""" self.buildDwarf() Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/Makefile Sun May 3 21:56:32 2015 @@ -1,8 +1,7 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp - +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules +CXXFLAGS += -O0 -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vbool/TestDataFormatterLibcxxVBool.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxVBoolDataFormatterTestCase(T self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # http://llvm.org/pr21800 @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/Makefile Sun May 3 21:56:32 2015 @@ -2,7 +2,6 @@ LEVEL = ../../../../../make CXX_SOURCES := main.cpp +USE_LIBCPP := 1 include $(LEVEL)/Makefile.rules - -CXXFLAGS += -stdlib=libc++ -O0 -LDFLAGS += -stdlib=libc++ \ No newline at end of file +CXXFLAGS += -O0 Modified: lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py (original) +++ lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/vector/TestDataFormatterLibcxxVector.py Sun May 3 21:56:32 2015 @@ -19,7 +19,7 @@ class LibcxxVectorDataFormatterTestCase( self.buildDsym() self.data_formatter_commands() - @skipIfLinux # No standard locations for libc++ on Linux, so skip for now + @skipIfGcc @skipIfWindows # libc++ not ported to Windows yet @dwarf_test def test_with_dwarf_and_run_command(self): Modified: lldb/trunk/test/lldbtest.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/lldbtest.py (original) +++ lldb/trunk/test/lldbtest.py Sun May 3 21:56:32 2015 @@ -1737,7 +1737,7 @@ class Base(unittest2.TestCase): return self.lib_dir def getLibcPlusPlusLibs(self): - if sys.platform.startswith('freebsd'): + if sys.platform.startswith('freebsd') or sys.platform.startswith('linux'): return ['libc++.so.1'] else: return ['libc++.1.dylib','libc++abi.dylib'] Modified: lldb/trunk/test/make/Makefile.rules URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/make/Makefile.rules?rev=236401&r1=236400&r2=236401&view=diff ============================================================================== --- lldb/trunk/test/make/Makefile.rules (original) +++ lldb/trunk/test/make/Makefile.rules Sun May 3 21:56:32 2015 @@ -237,6 +237,10 @@ ifeq (1,$(USE_LIBCPP)) ifneq (,$(findstring clang,$(CC))) CXXFLAGS += -stdlib=libc++ LDFLAGS += -stdlib=libc++ + ifeq "$(OS)" "Linux" + # This is the default install location on Ubuntu 14.04 + CXXFLAGS += -I/usr/include/c++/v1 + endif endif endif _______________________________________________ lldb-commits mailing list lldb-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits