Rollback [test-suite] Add a decorator for the lack of libstdcxx on the system.
Pavel suggested an alternative approach that I'll try to implement. llvm-svn: 336608
This commit is contained in:
parent
0eddbf8f95
commit
ec34220f5c
|
@ -687,18 +687,6 @@ def skipUnlessSupportedTypeAttribute(attr):
|
||||||
return None
|
return None
|
||||||
return skipTestIfFn(compiler_doesnt_support_struct_attribute)
|
return skipTestIfFn(compiler_doesnt_support_struct_attribute)
|
||||||
|
|
||||||
def skipUnlessLibstdcxxAvailable(func):
|
|
||||||
"""Decorate the item to skip test unless libstdc++ is available on the system."""
|
|
||||||
def compiler_doesnt_support_libstdcxx(self):
|
|
||||||
compiler_path = self.getCompiler()
|
|
||||||
f = tempfile.NamedTemporaryFile()
|
|
||||||
f = tempfile.NamedTemporaryFile()
|
|
||||||
cmd = "echo '#include <string> | %s -x c++ -stdlib=libstdc++ -o %s -" % (compiler_path, f.name)
|
|
||||||
if os.popen(cmd).close() is not None:
|
|
||||||
return "libstdcxx not available on the sytem"
|
|
||||||
return None
|
|
||||||
return skipTestIfFn(compiler_doesnt_support_libstdcxx)(func)
|
|
||||||
|
|
||||||
def skipUnlessThreadSanitizer(func):
|
def skipUnlessThreadSanitizer(func):
|
||||||
"""Decorate the item to skip test unless Clang -fsanitize=thread is supported."""
|
"""Decorate the item to skip test unless Clang -fsanitize=thread is supported."""
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,8 @@ class StdIteratorDataFormatterTestCase(TestBase):
|
||||||
# Find the line number to break at.
|
# Find the line number to break at.
|
||||||
self.line = line_number('main.cpp', '// Set break point at this line.')
|
self.line = line_number('main.cpp', '// Set break point at this line.')
|
||||||
|
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
def test_with_run_command(self):
|
def test_with_run_command(self):
|
||||||
"""Test that libstdcpp iterators format properly."""
|
"""Test that libstdcpp iterators format properly."""
|
||||||
self.build()
|
self.build()
|
||||||
|
|
|
@ -27,7 +27,8 @@ class StdListDataFormatterTestCase(TestBase):
|
||||||
self.final_line = line_number(
|
self.final_line = line_number(
|
||||||
'main.cpp', '// Set final break point at this line.')
|
'main.cpp', '// Set final break point at this line.')
|
||||||
|
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
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()
|
||||||
|
|
|
@ -23,7 +23,9 @@ class StdMapDataFormatterTestCase(TestBase):
|
||||||
# Find the line number to break at.
|
# Find the line number to break at.
|
||||||
self.line = line_number('main.cpp', '// Set break point at this line.')
|
self.line = line_number('main.cpp', '// Set break point at this line.')
|
||||||
|
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
|
@skipIfFreeBSD
|
||||||
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
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()
|
||||||
|
|
|
@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
|
||||||
class StdSmartPtrDataFormatterTestCase(TestBase):
|
class StdSmartPtrDataFormatterTestCase(TestBase):
|
||||||
mydir = TestBase.compute_mydir(__file__)
|
mydir = TestBase.compute_mydir(__file__)
|
||||||
|
|
||||||
|
@skipIfFreeBSD
|
||||||
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
@skipIfDarwin # doesn't compile on Darwin
|
@skipIfDarwin # doesn't compile on Darwin
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
def test_with_run_command(self):
|
def test_with_run_command(self):
|
||||||
self.build()
|
self.build()
|
||||||
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
||||||
|
|
|
@ -24,7 +24,8 @@ class StdStringDataFormatterTestCase(TestBase):
|
||||||
# Find the line number to break at.
|
# Find the line number to break at.
|
||||||
self.line = line_number('main.cpp', '// Set break point at this line.')
|
self.line = line_number('main.cpp', '// Set break point at this line.')
|
||||||
|
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
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()
|
||||||
|
|
|
@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
|
||||||
class StdTupleDataFormatterTestCase(TestBase):
|
class StdTupleDataFormatterTestCase(TestBase):
|
||||||
mydir = TestBase.compute_mydir(__file__)
|
mydir = TestBase.compute_mydir(__file__)
|
||||||
|
|
||||||
|
@skipIfFreeBSD
|
||||||
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
@skipIfDarwin # doesn't compile on Darwin
|
@skipIfDarwin # doesn't compile on Darwin
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
def test_with_run_command(self):
|
def test_with_run_command(self):
|
||||||
self.build()
|
self.build()
|
||||||
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
||||||
|
|
|
@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
|
||||||
class StdUniquePtrDataFormatterTestCase(TestBase):
|
class StdUniquePtrDataFormatterTestCase(TestBase):
|
||||||
mydir = TestBase.compute_mydir(__file__)
|
mydir = TestBase.compute_mydir(__file__)
|
||||||
|
|
||||||
|
@skipIfFreeBSD
|
||||||
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
@skipIfDarwin # doesn't compile on Darwin
|
@skipIfDarwin # doesn't compile on Darwin
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
def test_with_run_command(self):
|
def test_with_run_command(self):
|
||||||
self.build()
|
self.build()
|
||||||
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
self.runCmd("file " + self.getBuildArtifact("a.out"), CURRENT_EXECUTABLE_SET)
|
||||||
|
|
|
@ -23,8 +23,12 @@ class StdVBoolDataFormatterTestCase(TestBase):
|
||||||
# Find the line number to break at.
|
# Find the line number to break at.
|
||||||
self.line = line_number('main.cpp', '// Set break point at this line.')
|
self.line = line_number('main.cpp', '// Set break point at this line.')
|
||||||
|
|
||||||
|
@expectedFailureAll(
|
||||||
|
oslist=['freebsd'],
|
||||||
|
bugnumber='llvm.org/pr20548 fails to build on lab.llvm.org buildbot')
|
||||||
|
@skipIfWindows # libstdcpp not ported to Windows.
|
||||||
@skipIfDarwin
|
@skipIfDarwin
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
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()
|
||||||
|
|
|
@ -23,7 +23,9 @@ class StdVectorDataFormatterTestCase(TestBase):
|
||||||
# Find the line number to break at.
|
# Find the line number to break at.
|
||||||
self.line = line_number('main.cpp', '// Set break point at this line.')
|
self.line = line_number('main.cpp', '// Set break point at this line.')
|
||||||
|
|
||||||
@skipUnlessLibstdcxxAvailable
|
@skipIfFreeBSD
|
||||||
|
@skipIfWindows # libstdcpp not ported to Windows
|
||||||
|
@skipIfwatchOS # libstdcpp not ported to watchos
|
||||||
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()
|
||||||
|
|
Loading…
Reference in New Issue