This is an archive of the discontinued LLVM Phabricator instance.

Differential D13985

Enable the libc++ tests on linux
ClosedPublic

Authored by labath on Oct 22 2015, 7:48 AM.

Details

Reviewers
tfiala
granata.enrico
Commits
rG69e8f5cf4ef6: Enable the libc++ tests on linux
rLLDB251102: Enable the libc++ tests on linux
rL251102: Enable the libc++ tests on linux
Summary

The list of loaded modules which skip_if_library_missing is depending on is not available on
linux until after we run the target. This causes the tests to be wrongfully skipped. This commit
moves the skip call after the run command.

Diff Detail

Repository
rL LLVM

Event Timeline

labath updated this revision to Diff 38129.Oct 22 2015, 7:48 AM
labath retitled this revision from to Enable the libc++ tests on linux.
labath updated this object.
labath added reviewers: granata.enrico, tfiala.
labath added a subscriber: lldb-commits.
tfiala accepted this revision.Oct 22 2015, 8:06 AM
tfiala edited edge metadata.

LGTM. Good catch!

This revision is now accepted and ready to land.Oct 22 2015, 8:06 AM
tfiala added a comment.Oct 22 2015, 8:06 AM

(I don't think you need to wait for Enrico, btw.)

Closed by commit rL251102: Enable the libc++ tests on linux (authored by labath). · Explain WhyOct 23 2015, 2:19 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lldb/
trunk/
test/
functionalities/
data-formatter/
data-formatter-stl/
libcxx/
initializerlist/
4 lines
iterator/
4 lines
list/
4 lines
map/
4 lines
multimap/
4 lines
multiset/
4 lines
set/
4 lines
string/
4 lines
unordered/
4 lines

Diff 38221

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/initializerlist/TestInitializerList.py

Show All 15 Linesclass InitializerListTestCase(TestBase):
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
@skipIfGcc @skipIfGcc
@expectedFailureLinux # fails on clang 3.5 and tot @expectedFailureLinux # fails on clang 3.5 and tot
def test(self): def test(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line."))
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
self.expect("frame variable ili", substrs = ['[1] = 2','[4] = 5']) 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("frame variable ils", substrs = ['[4] = "surprise it is a long string!! yay!!"'])
self.expect('image list', substrs = self.getLibcPlusPlusLibs()) self.expect('image list', substrs = self.getLibcPlusPlusLibs())

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/iterator/TestDataFormatterLibccIterator.py

Show All 20 Linesclass LibcxxIteratorDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that libc++ iterators format properly.""" """Test that libc++ iterators format properly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
Show All 22 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/list/TestDataFormatterLibcxxList.py

Show All 23 Linesclass LibcxxListDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line2, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line2, num_expected_locations=-1)
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line3, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line3, num_expected_locations=-1)
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line4, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line4, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
▲ Show 20 Lines • Show All 136 Lines • Show Last 20 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/map/TestDataFormatterLibccMap.py

Show All 14 Linesclass LibcxxMapDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line."))
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
▲ Show 20 Lines • Show All 260 Lines • Show Last 20 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multimap/TestDataFormatterLibccMultiMap.py

Show All 14 Linesclass LibcxxMultiMapDataFormatterTestCase(TestBase):
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
@skipIfGcc @skipIfGcc
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line."))
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
▲ Show 20 Lines • Show All 260 Lines • Show Last 20 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/multiset/TestDataFormatterLibcxxMultiSet.py

Show All 14 Linesclass LibcxxMultiSetDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line."))
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
Show All 31 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/set/TestDataFormatterLibcxxSet.py

Show All 14 Linesclass LibcxxSetDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")) bkpt = self.target().FindBreakpointByID(lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line."))
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
Show All 31 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py

Show All 21 Linesclass LibcxxStringDataFormatterTestCase(TestBase):
@skipIfGcc @skipIfGcc
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1) lldbutil.run_break_set_by_file_and_line (self, "main.cpp", self.line, num_expected_locations=-1)
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
▲ Show 20 Lines • Show All 41 Lines • Show Last 20 Lines

lldb/trunk/test/functionalities/data-formatter/data-formatter-stl/libcxx/unordered/TestDataFormatterUnordered.py

Show All 14 Linesclass LibcxxUnorderedDataFormatterTestCase(TestBase):
@skipIfWindows # libc++ not ported to Windows yet @skipIfWindows # libc++ not ported to Windows yet
@skipIfGcc @skipIfGcc
def test_with_run_command(self): def test_with_run_command(self):
"""Test that that file and class static variables display correctly.""" """Test that that file and class static variables display correctly."""
self.build() self.build()
self.runCmd("file a.out", CURRENT_EXECUTABLE_SET) self.runCmd("file a.out", CURRENT_EXECUTABLE_SET)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.") lldbutil.run_break_set_by_source_regexp (self, "Set break point at this line.")
self.runCmd("run", RUN_SUCCEEDED) self.runCmd("run", RUN_SUCCEEDED)
lldbutil.skip_if_library_missing(self, self.target(), lldbutil.PrintableRegex("libc\+\+"))
# The stop reason of the thread should be breakpoint. # The stop reason of the thread should be breakpoint.
self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT, self.expect("thread list", STOPPED_DUE_TO_BREAKPOINT,
substrs = ['stopped', substrs = ['stopped',
'stop reason = breakpoint']) 'stop reason = breakpoint'])
# This is the function to remove the custom formats in order to have a # This is the function to remove the custom formats in order to have a
# clean slate for the next test case. # clean slate for the next test case.
def cleanup(): def cleanup():
Show All 37 Lines