From bcbda1dba34fe6ac7da2d61274d82baf4622dff9 Mon Sep 17 00:00:00 2001 From: Derek Parker Date: Tue, 28 Jul 2015 15:42:56 -0500 Subject: [PATCH] Rename version.After to version.AfterOrEqual --- proc/arch.go | 2 +- proc/go_version.go | 2 +- proc/proc_test.go | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/proc/arch.go b/proc/arch.go index 81a62fd2..5c19c405 100644 --- a/proc/arch.go +++ b/proc/arch.go @@ -39,7 +39,7 @@ func (a *AMD64) SetGStructOffset(ver GoVersion, isextld bool) { 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 } } diff --git a/proc/go_version.go b/proc/go_version.go index 6aaa3ebd..752c8d64 100644 --- a/proc/go_version.go +++ b/proc/go_version.go @@ -59,7 +59,7 @@ func parseVersionString(ver string) (GoVersion, bool) { return GoVersion{}, false } -func (a *GoVersion) After(b GoVersion) bool { +func (a *GoVersion) AfterOrEqual(b GoVersion) bool { if a.Major < b.Major { return false } else if a.Major > b.Major { diff --git a/proc/proc_test.go b/proc/proc_test.go index 840c67a7..ffc02a34 100644 --- a/proc/proc_test.go +++ b/proc/proc_test.go @@ -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) if !ok { 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.Logf("version string <%s> → %v", verStr, ver) } func TestParseVersionString(t *testing.T) { - versionAfter(t, "go1.5.0", GoVersion{1, 5, 0, 0}) - versionAfter(t, "go1.4.2", GoVersion{1, 4, 2, 0}) - versionAfter(t, "go1.5beta2", GoVersion{1, 5, -1, 2}) + versionAfterOrEqual(t, "go1.5.0", GoVersion{1, 5, 0, 0}) + versionAfterOrEqual(t, "go1.4.2", GoVersion{1, 4, 2, 0}) + versionAfterOrEqual(t, "go1.5beta2", GoVersion{1, 5, -1, 2}) ver, ok := parseVersionString("devel +17efbfc Tue Jul 28 17:39:19 2015 +0000 linux/amd64") if !ok { t.Fatalf("Could not parse devel version string") -- GitLab