Author: davide
Date: Mon Jul 9 14:56:28 2018
New Revision: 336608
URL: http://llvm.org/viewvc/llvm-project?rev=336608&view=rev
Log:
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.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/decorators.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
Modified: lldb/trunk/packages/Python/lldbsuite/test/decorators.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/decorators.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/decorators.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/decorators.py Mon Jul 9 14:56:28
2018
@@ -687,18 +687,6 @@ def skipUnlessSupportedTypeAttribute(att
return None
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):
"""Decorate the item to skip test unless Clang -fsanitize=thread is
supported."""
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/iterator/TestDataFormatterStdIterator.py
Mon Jul 9 14:56:28 2018
@@ -23,7 +23,8 @@ class StdIteratorDataFormatterTestCase(T
# Find the line number to break at.
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):
"""Test that libstdcpp iterators format properly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/list/TestDataFormatterStdList.py
Mon Jul 9 14:56:28 2018
@@ -27,7 +27,8 @@ class StdListDataFormatterTestCase(TestB
self.final_line = line_number(
'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):
"""Test that that file and class static variables display correctly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/map/TestDataFormatterStdMap.py
Mon Jul 9 14:56:28 2018
@@ -23,7 +23,9 @@ class StdMapDataFormatterTestCase(TestBa
# Find the line number to break at.
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):
"""Test that that file and class static variables display correctly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/smart_ptr/TestDataFormatterStdSmartPtr.py
Mon Jul 9 14:56:28 2018
@@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
class StdSmartPtrDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
+ @skipIfFreeBSD
+ @skipIfWindows # libstdcpp not ported to Windows
@skipIfDarwin # doesn't compile on Darwin
- @skipUnlessLibstdcxxAvailable
+ @skipIfwatchOS # libstdcpp not ported to watchos
def test_with_run_command(self):
self.build()
self.runCmd("file " + self.getBuildArtifact("a.out"),
CURRENT_EXECUTABLE_SET)
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py
Mon Jul 9 14:56:28 2018
@@ -24,7 +24,8 @@ class StdStringDataFormatterTestCase(Tes
# Find the line number to break at.
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):
"""Test that that file and class static variables display correctly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/tuple/TestDataFormatterStdTuple.py
Mon Jul 9 14:56:28 2018
@@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
class StdTupleDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
+ @skipIfFreeBSD
+ @skipIfWindows # libstdcpp not ported to Windows
@skipIfDarwin # doesn't compile on Darwin
- @skipUnlessLibstdcxxAvailable
+ @skipIfwatchOS # libstdcpp not ported to watchos
def test_with_run_command(self):
self.build()
self.runCmd("file " + self.getBuildArtifact("a.out"),
CURRENT_EXECUTABLE_SET)
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py
Mon Jul 9 14:56:28 2018
@@ -15,8 +15,10 @@ from lldbsuite.test import lldbutil
class StdUniquePtrDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
+ @skipIfFreeBSD
+ @skipIfWindows # libstdcpp not ported to Windows
@skipIfDarwin # doesn't compile on Darwin
- @skipUnlessLibstdcxxAvailable
+ @skipIfwatchOS # libstdcpp not ported to watchos
def test_with_run_command(self):
self.build()
self.runCmd("file " + self.getBuildArtifact("a.out"),
CURRENT_EXECUTABLE_SET)
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vbool/TestDataFormatterStdVBool.py
Mon Jul 9 14:56:28 2018
@@ -23,8 +23,12 @@ class StdVBoolDataFormatterTestCase(Test
# Find the line number to break at.
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
- @skipUnlessLibstdcxxAvailable
+ @skipIfwatchOS # libstdcpp not ported to watchos
def test_with_run_command(self):
"""Test that that file and class static variables display correctly."""
self.build()
Modified:
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py?rev=336608&r1=336607&r2=336608&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/vector/TestDataFormatterStdVector.py
Mon Jul 9 14:56:28 2018
@@ -23,7 +23,9 @@ class StdVectorDataFormatterTestCase(Tes
# Find the line number to break at.
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):
"""Test that that file and class static variables display correctly."""
self.build()
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
