summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/test/lldbtest.py9
1 files changed, 3 insertions, 6 deletions
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index ad20f698d7f..d0d798dc0d5 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -939,10 +939,7 @@ def skipUnlessGoInstalled(func):
self.skipTest("skipping because go compiler not found")
else:
# Ensure the version is the minimum version supported by
- # the go tests. Empirically this is *not* version go1.2.1
- # that comes with Ubuntu 14.04. Go maintainers should
- # verify, or possibly extend this decorator to provide
- # min go versions that can vary by test.
+ # the LLDB go support.
match_version = re.search(r"(\d+\.\d+(\.\d+)?)", compiler)
if not match_version:
# Couldn't determine version.
@@ -951,12 +948,12 @@ def skipUnlessGoInstalled(func):
"out of {}".format(compiler))
else:
from distutils.version import StrictVersion
- min_strict_version = StrictVersion("1.3.0")
+ min_strict_version = StrictVersion("1.4.0")
compiler_strict_version = StrictVersion(match_version.group(1))
if compiler_strict_version < min_strict_version:
self.skipTest(
"skipping because available go version ({}) does "
- "not meet minimum go version {}".format(
+ "not meet minimum required go version ({})".format(
compiler_strict_version,
min_strict_version))
func(*args, **kwargs)
OpenPOWER on IntegriCloud