go15 and later can be supported only, tested and confirmed
Этот коммит содержится в:
родитель
e62cfda29d
коммит
c191427d29
2 изменённых файлов: 3 добавлений и 6 удалений
|
@ -1,7 +1,5 @@
|
||||||
language: go
|
language: go
|
||||||
go:
|
go:
|
||||||
- 1.3
|
|
||||||
- 1.4
|
|
||||||
- 1.5
|
- 1.5
|
||||||
- 1.6
|
- 1.6
|
||||||
- tip
|
- tip
|
||||||
|
|
|
@ -21,14 +21,13 @@ var linker = filepath.Join(build.ToolDir, "link")
|
||||||
var gopaths = filepath.SplitList(build.Default.GOPATH)
|
var gopaths = filepath.SplitList(build.Default.GOPATH)
|
||||||
var goarch = build.Default.GOARCH
|
var goarch = build.Default.GOARCH
|
||||||
var goos = build.Default.GOOS
|
var goos = build.Default.GOOS
|
||||||
var supportVendor = os.Getenv("GO15VENDOREXPERIMENT") != "0"
|
|
||||||
|
|
||||||
var godogImportPath = "github.com/DATA-DOG/godog"
|
var godogImportPath = "github.com/DATA-DOG/godog"
|
||||||
var runnerTemplate = template.Must(template.New("testmain").Parse(`package main
|
var runnerTemplate = template.Must(template.New("testmain").Parse(`package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"github.com/DATA-DOG/godog"
|
"github.com/DATA-DOG/godog"
|
||||||
_test "{{ .ImportPath }}"
|
{{if .Contexts}}_test "{{.ImportPath}}"{{end}}
|
||||||
"os"
|
"os"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -155,7 +154,7 @@ func Build() (string, error) {
|
||||||
}
|
}
|
||||||
// if godog library is in vendor directory
|
// if godog library is in vendor directory
|
||||||
// link it with import map
|
// 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)
|
args = append(args, "-importmap", godogImportPath+"="+godogPkg.ImportPath)
|
||||||
}
|
}
|
||||||
for _, inc := range pkgDirs {
|
for _, inc := range pkgDirs {
|
||||||
|
@ -166,7 +165,7 @@ func Build() (string, error) {
|
||||||
cmd.Env = os.Environ()
|
cmd.Env = os.Environ()
|
||||||
out, err = cmd.CombinedOutput()
|
out, err = cmd.CombinedOutput()
|
||||||
if err != nil {
|
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
|
// link test suite executable
|
||||||
|
|
Загрузка…
Создание таблицы
Сослаться в новой задаче