Cleaned up a few unexpected successes on OS X

TestCallStdStringFunction
TestCallWithTimeout
TestConstVariables
TestClassTypes

llvm-svn: 247576

4 files changed, 1 insertions, 7 deletions

diff --git a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
index d39b9437d6c..da26763bb13 100644
--- a/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -20,7 +20,6 @@ class ExprCommandCallFunctionTestCase(TestBase):
 
     @skipUnlessDarwin
     @dsym_test
-    @expectedFailureDarwin(16361880) # <rdar://problem/16361880>, we get the result correctly, but fail to invoke the Summary formatter.
     def test_with_dsym(self):
         """Test calling std::String member function."""
         self.buildDsym()
@@ -29,7 +28,6 @@ class ExprCommandCallFunctionTestCase(TestBase):
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr17807') # Fails on FreeBSD buildbot
     @expectedFailureIcc # llvm.org/pr14437, fails with ICC 13.1
-    @expectedFailureDarwin(16361880) # <rdar://problem/16361880>, we get the result correctly, but fail to invoke the Summary formatter.
     @expectedFailureWindows("llvm.org/pr21765")
     def test_with_dwarf(self):
         """Test calling std::String member function."""
diff --git a/lldb/test/expression_command/timeout/TestCallWithTimeout.py b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
index 32eba36b9f6..6f9f4b0b1f8 100644
--- a/lldb/test/expression_command/timeout/TestCallWithTimeout.py
+++ b/lldb/test/expression_command/timeout/TestCallWithTimeout.py
@@ -21,7 +21,6 @@ class ExprCommandWithTimeoutsTestCase(TestBase):
 
     @skipUnlessDarwin
     @dsym_test
-    @expectedFailureDarwin # failed 1/134 runs, line 83, value.IsValid() 
     def test_with_dsym(self):
         """Test calling std::String member function."""
         self.buildDsym()
diff --git a/lldb/test/lang/c/const_variables/TestConstVariables.py b/lldb/test/lang/c/const_variables/TestConstVariables.py
index 18629b48e44..2209816c359 100644
--- a/lldb/test/lang/c/const_variables/TestConstVariables.py
+++ b/lldb/test/lang/c/const_variables/TestConstVariables.py
@@ -11,13 +11,12 @@ class ConstVariableTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @dsym_test
-    @unittest2.expectedFailure(13314878)
     def test_with_dsym_and_run_command(self):
         """Test interpreted and JITted expressions on constant values."""
         self.buildDsym()
         self.const_variable()
 
-    @expectedFailureClang('13314878') # This test works with gcc, but fails with newer version of clang on Linux due to a clang issue. Fails for icc as well. Bug number TDB.
+    @expectedFailureAll(oslist=["linux"], compiler=["clang", "icc"])
     @expectedFailureWindows("llvm.org/pr24489: Name lookup not working correctly on Windows")
     @expectedFailureWindows("llvm.org/pr24490: We shouldn't be using platform-specific names like `getpid` in tests")
     @dwarf_test
diff --git a/lldb/test/lang/cpp/class_types/TestClassTypes.py b/lldb/test/lang/cpp/class_types/TestClassTypes.py
index f0cbf1f8c97..18020cb178c 100644
--- a/lldb/test/lang/cpp/class_types/TestClassTypes.py
+++ b/lldb/test/lang/cpp/class_types/TestClassTypes.py
@@ -63,7 +63,6 @@ class ClassTypesTestCase(TestBase):
     # rdar://problem/8557478
     # test/class_types test failures: runCmd: expr this->m_c_int
     @dsym_test
-    @expectedFailureDarwin(16362674)
     def test_with_dsym_and_constructor_name(self):
         """Test 'frame variable this' and 'expr this' when stopped inside a constructor."""
         self.buildDsym()
@@ -73,7 +72,6 @@ class ClassTypesTestCase(TestBase):
     # test/class_types test failures: runCmd: expr this->m_c_int
     @dwarf_test
     @expectedFailureFreeBSD('llvm.org/pr14540')
-    @expectedFailureDarwin(16362674)
     def test_with_dwarf_and_constructor_name (self):
         """Test 'frame variable this' and 'expr this' when stopped inside a constructor."""
         self.buildDwarf()