From 4a289a93f733b9eafb85cd60dad7b0c24e2f51e4 Mon Sep 17 00:00:00 2001 From: Zachary Turner Date: Mon, 8 Feb 2016 19:34:59 +0000 Subject: Remove expectedFailureWindows decorator. expectedFailureWindows is equivalent to using the general expectedFailureAll decorator with oslist="windows". Additionally, by moving towards these common decorators we can solve the issue of having to support decorators that can be called with or without arguments. Once all decorators are always called with arguments, and this is enforced by design (because you can't specify the condition you're decorating for without passing an argument) the implementation of the decorators can become much simpler Differential Revision: http://reviews.llvm.org/D16936 llvm-svn: 260134 --- .../test/lang/cpp/namespace/TestNamespaceLookup.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py') diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py index 92e938e95ab..de160d846c7 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/namespace/TestNamespaceLookup.py @@ -34,9 +34,7 @@ class NamespaceLookupTestCase(TestBase): substrs = ['stopped', 'stop reason = breakpoint']) - @expectedFailureFreeBSD("llvm.org/pr25819") - @expectedFailureLinux("llvm.org/pr25819") - @expectedFailureWindows("llvm.org/pr25819") + @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819") def test_scope_lookup_with_run_command(self): """Test scope lookup of functions in lldb.""" self.build() @@ -146,8 +144,7 @@ class NamespaceLookupTestCase(TestBase): # finds the global ::func(). self.expect("expr -- func()", startstr = "(int) $0 = 2") - @expectedFailureLinux("llvm.org/pr25819") - @expectedFailureWindows("llvm.org/pr25819") + @expectedFailureAll(oslist=["windows", "linux"], bugnumber="llvm.org/pr25819") def test_scope_lookup_before_using_with_run_command(self): """Test scope lookup before using in lldb.""" self.build() @@ -162,9 +159,7 @@ class NamespaceLookupTestCase(TestBase): # NOTE: this test may fail on older systems that don't emit import # entries in DWARF - may need to add checks for compiler versions here. - @expectedFailureFreeBSD("llvm.org/pr25819") - @expectedFailureLinux("llvm.org/pr25819") - @expectedFailureWindows("llvm.org/pr25819") + @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819") def test_scope_after_using_directive_lookup_with_run_command(self): """Test scope lookup after using directive in lldb.""" self.build() @@ -207,9 +202,7 @@ class NamespaceLookupTestCase(TestBase): # the same type. self.expect("expr -- func()", startstr = "error") - @expectedFailureFreeBSD("llvm.org/pr25819") - @expectedFailureLinux("llvm.org/pr25819") - @expectedFailureWindows("llvm.org/pr25819") + @expectedFailureAll(oslist=["windows", "linux", "freebsd"], bugnumber="llvm.org/pr25819") def test_scope_lookup_shadowed_by_using_with_run_command(self): """Test scope lookup shadowed by using in lldb.""" self.build() -- cgit v1.2.3