From f9f6c208d62980f1511abfd5724e5764cd4e68a4 Mon Sep 17 00:00:00 2001 From: gedi Date: Sat, 3 Mar 2018 20:48:45 +0200 Subject: [PATCH] vendor package support missing still for go1.10 --- builder_go110.go | 6 +++--- builder_test.go | 19 ------------------- 2 files changed, 3 insertions(+), 22 deletions(-) diff --git a/builder_go110.go b/builder_go110.go index c8dee05..568eede 100644 --- a/builder_go110.go +++ b/builder_go110.go @@ -170,10 +170,10 @@ func Build(bin string) error { for pkgName, pkgObj := range deps { if i := strings.LastIndex(pkgName, "vendor/"); i != -1 { - fmt.Fprintf(in, "importmap %s=%s\n", pkgName, pkgObj) - } else { - fmt.Fprintf(in, "packagefile %s=%s\n", pkgName, pkgObj) + name := pkgName[i+7:] + fmt.Fprintf(in, "importmap %s=%s\n", name, pkgName) } + fmt.Fprintf(in, "packagefile %s=%s\n", pkgName, pkgObj) } } in.Close() diff --git a/builder_test.go b/builder_test.go index 83d95de..4a1c5ac 100644 --- a/builder_test.go +++ b/builder_test.go @@ -6,25 +6,6 @@ import ( "testing" ) -func TestDeps(t *testing.T) { - t.Log("hh") - - abs, err := filepath.Abs(".") - if err != nil { - t.Fatal(err) - } - - // we allow package to be nil, if godog is run only when - // there is a feature file in empty directory - pkg := importPackage(abs) - deps := make(map[string]string) - err = dependencies(pkg, deps) - if err != nil { - t.Fatal(err) - } - t.Log(deps) -} - func TestBuildTestRunner(t *testing.T) { bin := filepath.Join(os.TempDir(), "godog.test") if err := Build(bin); err != nil {