From abb79683bbd89043d3e0bf4141f3b7ea54c86dfe Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Mon, 4 Jul 2016 09:27:53 +0000 Subject: [PATCH] Join TestTlsGlobal tests again and use the proper decorator llvm-svn: 274490 --- .../test/lang/c/tls_globals/TestTlsGlobals.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py index 3aadbc8d7fa9..0ca9923c89a6 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py +++ b/lldb/packages/Python/lldbsuite/test/lang/c/tls_globals/TestTlsGlobals.py @@ -27,18 +27,8 @@ class TlsGlobalTestCase(TestBase): self.addTearDownHook(lambda: self.runCmd("settings remove target.env-vars " + self.dylibPath)) @skipIfWindows # TLS works differently on Windows, this would need to be implemented separately. - @skipIfDarwin # Darwin has its own test below and we don't want it to expected fail with decorator below - @unittest2.expectedFailure("llvm.org/pr28392") - def test_non_darwin(self): - '''Mark as expected fail for all except Darwin or Windows''' - self.run_test() - - @skipUnlessDarwin - def test_darwin(self): - '''Always run on darwin with no expected fail''' - self.run_test() - - def run_test(self): + @expectedFailureAll(bugnumber="llvm.org/pr28392", oslist=no_match(lldbplatformutil.getDarwinOSTriples())) + def test(self): """Test thread-local storage.""" self.build() exe = os.path.join(os.getcwd(), "a.out")