Commit 430b9cb9 authored by Alberto Donizetti's avatar Alberto Donizetti

runtime: revert "skip TestLldbPython when lldb is too old"

This reverts commit d2170040.

Reason for revert: It broke all the darwin builders; it's also not
obvious how the weird darwin versions (900, 1000) relate to the > 3.9
requisite, so I'm not sure how to decide about skipping in a robust
way. It's better to revert the check for now.

Fixes #28028

Change-Id: Ibbcb7bf7cd2136e0851ebd097a2bc4dec9f0ee18
Reviewed-on: https://go-review.googlesource.com/c/140217Reviewed-by: 's avatarKeith Randall <khr@golang.org>
parent 9d907160
......@@ -10,9 +10,7 @@ import (
"os"
"os/exec"
"path/filepath"
"regexp"
"runtime"
"strconv"
"strings"
"testing"
)
......@@ -27,27 +25,6 @@ func checkLldbPython(t *testing.T) {
}
lldbPath = strings.TrimSpace(string(out))
// Check lldb version. The test is known to fail with 3.8 or older
// (see Issue #22299).
cmd = exec.Command("lldb", "--version")
out, err = cmd.CombinedOutput()
// lldb --version should print "lldb version a.b.c"
re := regexp.MustCompile(` ([[:digit:]]+)\.([[:digit:]]+)`)
lldbVersion := re.FindStringSubmatch(string(out))
if len(lldbVersion) != 3 {
t.Errorf("bad lldb --version output: %s", out)
}
major, err1 := strconv.Atoi(lldbVersion[1])
minor, err2 := strconv.Atoi(lldbVersion[2])
if err1 != nil || err2 != nil {
t.Errorf("bad lldb --version output: %s", out)
}
if (major < 3) || (major == 3 && minor < 9) {
t.Skipf("skipping because lldb version %v.%v is too old (need >= 3.9)", major, minor)
}
cmd = exec.Command("/usr/bin/python2.7", "-c", "import sys;sys.path.append(sys.argv[1]);import lldb; print('go lldb python support')", lldbPath)
out, err = cmd.CombinedOutput()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment