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

Rename version.After to version.AfterOrEqual

Browse Source
This commit is contained in:
Derek Parker 2015-07-28 15:42:56 -05:00
parent 311da7c314
commit bcbda1dba3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
proc/arch.go
View File

@ -39,7 +39,7 @@ func (a *AMD64) SetGStructOffset(ver GoVersion, isextld bool) {
a.gStructOffset = 0xfffffffffffffff0 a.gStructOffset = 0xfffffffffffffff0
} }
if isextld || ver.After(GoVersion{1, 5, -1, 2}) || ver.IsDevel() { if isextld || ver.AfterOrEqual(GoVersion{1, 5, -1, 2}) || ver.IsDevel() {
a.gStructOffset += 8 a.gStructOffset += 8
} }
} }

2
proc/go_version.go
View File

@ -59,7 +59,7 @@ func parseVersionString(ver string) (GoVersion, bool) {
return GoVersion{}, false return GoVersion{}, false
} }
func (a *GoVersion) After(b GoVersion) bool { func (a *GoVersion) AfterOrEqual(b GoVersion) bool {
if a.Major < b.Major { if a.Major < b.Major {
return false return false
} else if a.Major > b.Major { } else if a.Major > b.Major {

10
proc/proc_test.go
View File

@ -660,21 +660,21 @@ func TestContinueMulti(t *testing.T) {
}) })
} }
func versionAfter(t *testing.T, verStr string, ver GoVersion) { func versionAfterOrEqual(t *testing.T, verStr string, ver GoVersion) {
pver, ok := parseVersionString(verStr) pver, ok := parseVersionString(verStr)
if !ok { if !ok {
t.Fatalf("Could not parse version string <%s>", verStr) t.Fatalf("Could not parse version string <%s>", verStr)
} }
if !pver.After(ver) { if !pver.AfterOrEqual(ver) {
t.Fatalf("Version <%s> parsed as %v not after %v", verStr, pver, ver) t.Fatalf("Version <%s> parsed as %v not after %v", verStr, pver, ver)
} }
t.Logf("version string <%s> → %v", verStr, ver) t.Logf("version string <%s> → %v", verStr, ver)
} }
func TestParseVersionString(t *testing.T) { func TestParseVersionString(t *testing.T) {
versionAfter(t, "go1.5.0", GoVersion{1, 5, 0, 0}) versionAfterOrEqual(t, "go1.5.0", GoVersion{1, 5, 0, 0})
versionAfter(t, "go1.4.2", GoVersion{1, 4, 2, 0}) versionAfterOrEqual(t, "go1.4.2", GoVersion{1, 4, 2, 0})
versionAfter(t, "go1.5beta2", GoVersion{1, 5, -1, 2}) versionAfterOrEqual(t, "go1.5beta2", GoVersion{1, 5, -1, 2})
ver, ok := parseVersionString("devel +17efbfc Tue Jul 28 17:39:19 2015 +0000 linux/amd64") ver, ok := parseVersionString("devel +17efbfc Tue Jul 28 17:39:19 2015 +0000 linux/amd64")
if !ok { if !ok {
t.Fatalf("Could not parse devel version string") t.Fatalf("Could not parse devel version string")