<div dir="ltr">Siva did include a link in a separate thread: <a href="http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-cmake/builds/8688" rel="noreferrer" target="_blank" style="font-size:16px">http://lab.llvm.org:8011/builders/lldb-x86_64-ubuntu-14.04-cmake/builds/8688</a><div><br></div><div>Sorry about breaking this twice. I guess I'm going to have to get a Linux box.<br><div><br></div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Nov 20, 2015 at 1:14 PM, Zachary Turner via lldb-commits <span dir="ltr"><<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">When you revert a commit, can you please include a log to the buildbot? Otherwise we have no easy way of diagnosing the failure.</div><div class="HOEnZb"><div class="h5"><br><div class="gmail_quote"><div dir="ltr">On Fri, Nov 20, 2015 at 12:33 PM Siva Chandra via lldb-commits <<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: sivachandra<br>
Date: Fri Nov 20 14:30:36 2015<br>
New Revision: 253704<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=253704&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=253704&view=rev</a><br>
Log:<br>
Revert "Make skipIf support the not_in function (second attempt)."<br>
<br>
Summary: This reverts commit 70dca28976ee8137acce2cc203dd394f4d761276.<br>
<br>
Reviewers: amccarth, zturner<br>
<br>
Subscribers: lldb-commits<br>
<br>
Differential Revision: <a href="http://reviews.llvm.org/D14881" rel="noreferrer" target="_blank">http://reviews.llvm.org/D14881</a><br>
<br>
Modified:<br>
lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py<br>
<br>
Modified: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=253704&r1=253703&r2=253704&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py?rev=253704&r1=253703&r2=253704&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py (original)<br>
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py Fri Nov 20 14:30:36 2015<br>
@@ -648,15 +648,11 @@ def expectedFailure(expected_fn, bugnumb<br>
def not_in (iterable):<br>
return lambda x : x not in iterable<br>
<br>
-def check_decorator_attribute(attr, value):<br>
- if attr is None:<br>
- return True<br>
- if six.callable(attr):<br>
- return attr(value)<br>
- elif isinstance(attr, (list, tuple)):<br>
- return value in attr<br>
- else:<br>
- return value == attr<br>
+def check_list_or_lambda (list_or_lambda, value):<br>
+ if six.callable(list_or_lambda):<br>
+ return list_or_lambda(value)<br>
+ else:<br>
+ return list_or_lambda is None or value is None or value in list_or_lambda<br>
<br>
# provide a function to xfail on defined oslist, compiler version, and archs<br>
# if none is specified for any argument, that argument won't be checked and thus means for all<br>
@@ -666,11 +662,11 @@ def check_decorator_attribute(attr, valu<br>
# @expectedFailureAll(bugnumber, ["linux"], "gcc", ['>=', '4.9'], ['i386']), xfail for gcc>=4.9 on linux with i386<br>
def expectedFailureAll(bugnumber=None, oslist=None, compiler=None, compiler_version=None, archs=None, triple=None, debug_info=None, swig_version=None, py_version=None):<br>
def fn(self):<br>
- oslist_passes = check_decorator_attribute(oslist, self.getPlatform())<br>
- compiler_passes = check_decorator_attribute(self.getCompiler(), compiler) and self.expectedCompilerVersion(compiler_version)<br>
+ oslist_passes = check_list_or_lambda(oslist, self.getPlatform())<br>
+ compiler_passes = check_list_or_lambda(self.getCompiler(), compiler) and self.expectedCompilerVersion(compiler_version)<br>
arch_passes = self.expectedArch(archs)<br>
triple_passes = triple is None or re.match(triple, lldb.DBG.GetSelectedPlatform().GetTriple())<br>
- debug_info_passes = check_decorator_attribute(debug_info, self.debug_info)<br>
+ debug_info_passes = check_list_or_lambda(debug_info, self.debug_info)<br>
swig_version_passes = (swig_version is None) or (not hasattr(lldb, 'swig_version')) or (check_expected_version(swig_version[0], swig_version[1], lldb.swig_version))<br>
py_version_passes = (py_version is None) or check_expected_version(py_version[0], py_version[1], sys.version_info)<br>
<br>
@@ -1104,10 +1100,10 @@ def skipIfLinuxClang(func):<br>
# TODO: refactor current code, to make skipIfxxx functions to call this function<br>
def skipIf(bugnumber=None, oslist=None, compiler=None, compiler_version=None, archs=None, debug_info=None, swig_version=None, py_version=None):<br>
def fn(self):<br>
- oslist_passes = check_decorator_attribute(oslist, self.getPlatform())<br>
- compiler_passes = check_decorator_attribute(compiler, self.getCompiler()) and self.expectedCompilerVersion(compiler_version)<br>
+ oslist_passes = oslist is None or self.getPlatform() in oslist<br>
+ compiler_passes = compiler is None or (compiler in self.getCompiler() and self.expectedCompilerVersion(compiler_version))<br>
arch_passes = self.expectedArch(archs)<br>
- debug_info_passes = check_decorator_attribute(debug_info, self.debug_info)<br>
+ debug_info_passes = debug_info is None or self.debug_info in debug_info<br>
swig_version_passes = (swig_version is None) or (not hasattr(lldb, 'swig_version')) or (check_expected_version(swig_version[0], swig_version[1], lldb.swig_version))<br>
py_version_passes = (py_version is None) or check_expected_version(py_version[0], py_version[1], sys.version_info)<br>
<br>
<br>
<br>
_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org" target="_blank">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
</blockquote></div>
</div></div><br>_______________________________________________<br>
lldb-commits mailing list<br>
<a href="mailto:lldb-commits@lists.llvm.org">lldb-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits</a><br>
<br></blockquote></div><br></div>