<div dir="ltr">Okay, I can adjust that.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Oct 6, 2015 at 1:24 PM, Ryan Brown <span dir="ltr"><<a href="mailto:ribrdb@google.com" target="_blank">ribrdb@google.com</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">I was wondering if we'd need this. Go 1.4 is the minimum supported version.</div><br><div class="gmail_quote"><div dir="ltr">On Tue, Oct 6, 2015 at 12:17 PM Todd Fiala 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: tfiala<br>
Date: Tue Oct 6 14:15:56 2015<br>
New Revision: 249446<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=249446&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=249446&view=rev</a><br>
Log:<br>
Address failing Go tests on go version from Ubuntu 14.04<br>
<br>
Go tests fail on Ubuntu 14.04's go1.2.1. This change puts a minimum<br>
go version in the skipUnlessGoInstalled() decorator of go1.3.0.<br>
Go maintainers are encouraged to modify as needed. For now this fixes<br>
failing tests on Ubuntu 14.04 x86_64 buildbots with stock distro go installed.<br>
<br>
Modified:<br>
lldb/trunk/test/lldbtest.py<br>
<br>
Modified: lldb/trunk/test/lldbtest.py<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=249446&r1=249445&r2=249446&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=249446&r1=249445&r2=249446&view=diff</a><br>
==============================================================================<br>
--- lldb/trunk/test/lldbtest.py (original)<br>
+++ lldb/trunk/test/lldbtest.py Tue Oct 6 14:15:56 2015<br>
@@ -938,7 +938,29 @@ def skipUnlessGoInstalled(func):<br>
if not compiler:<br>
self.skipTest("skipping because go compiler not found")<br>
else:<br>
- func(*args, **kwargs)<br>
+ # Ensure the version is the minimum version supported by<br>
+ # the go tests. Empirically this is *not* version go1.2.1<br>
+ # that comes with Ubuntu 14.04. Go maintainers should<br>
+ # verify, or possibly extend this decorator to provide<br>
+ # min go versions that can vary by test.<br>
+ match_version = re.search(r"(\d+\.\d+(\.\d+)?)", compiler)<br>
+ if not match_version:<br>
+ # Couldn't determine version.<br>
+ self.skipTest(<br>
+ "skipping because go version could not be parsed "<br>
+ "out of {}".format(compiler))<br>
+ else:<br>
+ from distutils.version import StrictVersion<br>
+ min_strict_version = StrictVersion("1.3.0")<br>
+ compiler_strict_version = StrictVersion(match_version.group(1))<br>
+ if compiler_strict_version < min_strict_version:<br>
+ self.skipTest(<br>
+ "skipping because available go version ({}) does "<br>
+ "not meet minimum go version {}".format(<br>
+ compiler_strict_version,<br>
+ min_strict_version))<br>
+ if not skip_test:<br>
+ func(*args, **kwargs)<br>
return wrapper<br>
<br>
def getPlatform():<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>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">-Todd</div></div>
</div>