Commit 57b5a71d authored by Austin Clements's avatar Austin Clements

Revert "runtime: fix lldb test after DWARF compression"

This reverts commit c9930022.

The original CL skipped the lldb test if it couldn't read compressed
DWARF, but lldb can never read compressed DWARF, so this effectively
disabled this test unconditionally.

The previous commit disabled DWARF compression for this test, so the
test now works on its own merits again. This CL reverts the change to
skip the test so we don't simply mask lldb failures.

Updates #25925.

Change-Id: I3e1c787b658257b542c3c70807065dde9cfe05ee
Reviewed-on: https://go-review.googlesource.com/124386
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarBrad Fitzpatrick <bradfitz@golang.org>
parent ff5b54d2
......@@ -10,7 +10,6 @@ import (
"os"
"os/exec"
"path/filepath"
"regexp"
"runtime"
"strings"
"testing"
......@@ -83,12 +82,8 @@ target = debugger.CreateTargetWithFileAndArch("a.exe", None)
if target:
print "Created target"
main_bp = target.BreakpointCreateByLocation("main.go", 10)
if main_bp.GetNumLocations() != 0:
if main_bp:
print "Created breakpoint"
else:
# This happens if lldb can't read the program's DWARF. See https://golang.org/issue/25925.
print "SKIP: no matching locations for breakpoint"
exit(1)
process = target.LaunchSimple(None, None, os.getcwd())
if process:
print "Process launched"
......@@ -103,7 +98,7 @@ if target:
if state in [lldb.eStateUnloaded, lldb.eStateLaunching, lldb.eStateRunning]:
continue
else:
print "SKIP: Timeout launching"
print "Timeout launching"
break
if state == lldb.eStateStopped:
for t in process.threads:
......@@ -179,9 +174,8 @@ func TestLldbPython(t *testing.T) {
got, _ := cmd.CombinedOutput()
if string(got) != expectedLldbOutput {
skipReason := regexp.MustCompile("SKIP: .*\n").Find(got)
if skipReason != nil {
t.Skip(string(skipReason))
if strings.Contains(string(got), "Timeout launching") {
t.Skip("Timeout launching")
}
t.Fatalf("Unexpected lldb output:\n%s", got)
}
......
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