Fix up bad compiler spec on ConstVariableTestCase; fixup two more OS X unexpected successes.

llvm-svn: 247591

lldb/test/expression_command/radar_9673664/TestExprHelpExamples.py

@@ -19,7 +19,6 @@ class Radar9673644TestCase(TestBase):
         self.main_source = "main.c"
         self.line = line_number(self.main_source, '// Set breakpoint here.')
 
-    @expectedFailureDarwin(15641319)
     @expectedFailureWindows("llvm.org/pr21765")
     def test_expr_commands(self):
         """The following expression commands should just work."""

lldb/test/functionalities/avoids-fd-leak/TestFdLeak.py

@@ -8,17 +8,24 @@ import lldb
 from lldbtest import *
 import lldbutil
 
+
+def python_leaky_fd_version(test):
+    import sys
+    # Python random module leaks file descriptors on some versions.
+    return sys.version_info >= (2, 7, 8) and sys.version_info < (2, 7, 10)
+
+
 class AvoidsFdLeakTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
+    @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
     @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
     def test_fd_leak_basic (self):
         self.do_test([])
 
-    @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
+    @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
     @skipIfTargetAndroid() # Android have some other file descriptors open by the shell
     def test_fd_leak_log (self):
@@ -40,7 +47,7 @@ class AvoidsFdLeakTestCase(TestBase):
         self.assertTrue(process.GetExitStatus() == 0,
                 "Process returned non-zero status. Were incorrect file descriptors passed?")
 
-    @expectedFailure(lambda x: sys.version_info >= (2, 7, 8), "bugs.freebsd.org/197376") # python random leaks fd
+    @expectedFailure(python_leaky_fd_version, "bugs.freebsd.org/197376")
     @expectedFlakeyLinux
     @skipIfWindows # The check for descriptor leakage needs to be implemented differently here.
     @skipIfTargetAndroid() # Android have some other file descriptors open by the shell

lldb/test/lang/c/const_variables/TestConstVariables.py

@@ -16,7 +16,8 @@ class ConstVariableTestCase(TestBase):
         self.buildDsym()
         self.const_variable()
 
-    @expectedFailureAll(oslist=["linux"], compiler=["clang", "icc"])
+    @expectedFailureAll(oslist=["linux"], compiler="clang")
+    @expectedFailureAll(oslist=["linux"], compiler="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