From c191427d295ed3fb94f4979b9489d9009a488110 Mon Sep 17 00:00:00 2001 From: gedi Date: Wed, 15 Jun 2016 14:38:29 +0300 Subject: [PATCH] go15 and later can be supported only, tested and confirmed --- .travis.yml | 2 -- builder.go | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 040c59f..adbca21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,5 @@ language: go go: - - 1.3 - - 1.4 - 1.5 - 1.6 - tip diff --git a/builder.go b/builder.go index bd17d2c..230d512 100644 --- a/builder.go +++ b/builder.go @@ -21,14 +21,13 @@ var linker = filepath.Join(build.ToolDir, "link") var gopaths = filepath.SplitList(build.Default.GOPATH) var goarch = build.Default.GOARCH var goos = build.Default.GOOS -var supportVendor = os.Getenv("GO15VENDOREXPERIMENT") != "0" var godogImportPath = "github.com/DATA-DOG/godog" var runnerTemplate = template.Must(template.New("testmain").Parse(`package main import ( "github.com/DATA-DOG/godog" - _test "{{ .ImportPath }}" + {{if .Contexts}}_test "{{.ImportPath}}"{{end}} "os" ) @@ -155,7 +154,7 @@ func Build() (string, error) { } // if godog library is in vendor directory // link it with import map - if i := strings.LastIndex(godogPkg.ImportPath, "vendor/"); i != -1 && supportVendor { + if i := strings.LastIndex(godogPkg.ImportPath, "vendor/"); i != -1 { args = append(args, "-importmap", godogImportPath+"="+godogPkg.ImportPath) } for _, inc := range pkgDirs { @@ -166,7 +165,7 @@ func Build() (string, error) { cmd.Env = os.Environ() out, err = cmd.CombinedOutput() if err != nil { - return bin, fmt.Errorf("failed to compile testmain package - %v:\n%s", err, string(out)) + return bin, fmt.Errorf("failed to compile testmain package:\n%s", string(out)) } // link test suite executable