PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove erroneous stuff from helper package

Browse Source
This commit is contained in:
Derek Parker 2014-12-09 10:35:55 -06:00
parent 12949e3406
commit 813340abe6
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
helper/helper.go
View File

@ -12,18 +12,9 @@ import (
type testfunc func(p *proctl.DebuggedProcess)
func GetRegisters(p *proctl.DebuggedProcess, t *testing.T) proctl.Registers {
regs, err := p.Registers()
if err != nil {
t.Fatal("Registers():", err)
}
return regs
}
func WithTestProcess(name string, t *testing.T, fn testfunc) {
runtime.LockOSThread()
base, err := CompileTestProg(name)
base, err := compileTestProg(name)
if err != nil {
t.Fatalf("Could not compile %s due to %s", name, err)
}
@ -39,12 +30,7 @@ func WithTestProcess(name string, t *testing.T, fn testfunc) {
fn(p)
}
func CompileTestProg(source string) (string, error) {
func compileTestProg(source string) (string, error) {
base := filepath.Base(source)
return base, exec.Command("go", "build", "-gcflags=-N -l", "-o", base, source+".go").Run()
}
func startTestProcess(name string) (*exec.Cmd, error) {
cmd := exec.Command("./" + name)
return cmd, cmd.Start()
}

13
proctl/proctl_test.go
View File

@ -9,6 +9,15 @@ import (
"github.com/derekparker/delve/proctl"
)
func getRegisters(p *proctl.DebuggedProcess, t *testing.T) proctl.Registers {
regs, err := p.Registers()
if err != nil {
t.Fatal("Registers():", err)
}
return regs
}
func dataAtAddr(pid int, addr uint64) ([]byte, error) {
data := make([]byte, 1)
_, err := proctl.ReadMemory(pid, uintptr(addr), data)
@ -50,13 +59,13 @@ func TestStep(t *testing.T) {
assertNoError(err, t, "Break()")
assertNoError(p.Continue(), t, "Continue()")
regs := helper.GetRegisters(p, t)
regs := getRegisters(p, t)
rip := regs.PC()
err = p.Step()
assertNoError(err, t, "Step()")
regs = helper.GetRegisters(p, t)
regs = getRegisters(p, t)
if rip >= regs.PC() {
t.Errorf("Expected %#v to be greater than %#v", regs.PC(), rip)
}