mirrors
/
restic
mirror of https://github.com/restic/restic.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove old Go versions from run_integration_tests.go

This commit is contained in:
Alexander Neumann 2017-04-15 11:06:50 +02:00
parent 6357dc8a91
commit ee7e0d05f5
1 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
run_integration_tests.go
View File

@ -14,7 +14,6 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"regexp"
"runtime" "runtime"
"strings" "strings"
) )
@ -200,7 +199,7 @@ func (env *TravisEnvironment) Prepare() error {
return err return err
} }
if *runCrossCompile && !(runtime.Version() < "go1.7") { if *runCrossCompile {
// only test cross compilation on linux with Travis // only test cross compilation on linux with Travis
if err := run("go", "get", "github.com/mitchellh/gox"); err != nil { if err := run("go", "get", "github.com/mitchellh/gox"); err != nil {
return err return err
@ -212,25 +211,13 @@ func (env *TravisEnvironment) Prepare() error {
"darwin/386", "darwin/amd64", "darwin/386", "darwin/amd64",
"freebsd/386", "freebsd/amd64", "freebsd/386", "freebsd/amd64",
"openbsd/386", "openbsd/amd64", "openbsd/386", "openbsd/amd64",
} "linux/arm", "freebsd/arm",
if !strings.HasPrefix(runtime.Version(), "go1.3") {
env.goxOSArch = append(env.goxOSArch,
"linux/arm", "freebsd/arm")
} }
} else { } else {
env.goxOSArch = []string{runtime.GOOS + "/" + runtime.GOARCH} env.goxOSArch = []string{runtime.GOOS + "/" + runtime.GOARCH}
} }
msg("gox: OS/ARCH %v\n", env.goxOSArch) msg("gox: OS/ARCH %v\n", env.goxOSArch)
if runtime.Version() < "go1.5" {
err := run("gox", "-build-toolchain",
"-osarch", strings.Join(env.goxOSArch, " "))
if err != nil {
return err
}
}
} }
return nil return nil
@ -288,20 +275,6 @@ func (env *TravisEnvironment) Teardown() error {
return nil return nil
} }
func goVersionAtLeast151() bool {
v := runtime.Version()
if match, _ := regexp.MatchString(`^go1\.[0-4]`, v); match {
return false
}
if v == "go1.5" {
return false
}
return true
}
// Background is a program running in the background. // Background is a program running in the background.
type Background struct { type Background struct {
Cmd *exec.Cmd Cmd *exec.Cmd
@ -372,7 +345,7 @@ func (env *TravisEnvironment) RunTests() error {
env.env["GOPATH"] = cwd + ":" + filepath.Join(cwd, "vendor") env.env["GOPATH"] = cwd + ":" + filepath.Join(cwd, "vendor")
if *runCrossCompile && !(runtime.Version() < "go1.7") { if *runCrossCompile {
// compile for all target architectures with tags // compile for all target architectures with tags
for _, tags := range []string{"release", "debug"} { for _, tags := range []string{"release", "debug"} {
err := runWithEnv(env.env, "gox", "-verbose", err := runWithEnv(env.env, "gox", "-verbose",