Skip to content
This repository was archived by the owner on Sep 9, 2020. It is now read-only.

Commit 1ae6314

Browse files
committed
allow dirs that don't contain go files
1 parent 13df556 commit 1ae6314

File tree

5 files changed

+20
-17
lines changed

5 files changed

+20
-17
lines changed

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
["init", "-no-examples", "-skip-tools"],
44
["ensure", "-update"]
55
],
6-
"error-expected": "no dirs contained any Go code",
6+
"error-expected": "",
77
"vendor-final": []
88
}

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/final/Gopkg.lock

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/testcase.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
"commands": [
33
["ensure"]
44
],
5-
"error-expected": "found 1 errors",
5+
"error-expected": "",
66
"vendor-final": []
77
}

gps/pkgtree/pkgtree.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,6 @@ func fillPackage(p *build.Package) error {
221221
return err
222222
}
223223

224-
if len(gofiles) == 0 {
225-
return &build.NoGoError{Dir: p.Dir}
226-
}
227-
228224
var testImports []string
229225
var imports []string
230226
var importComments []string

gps/pkgtree/pkgtree_test.go

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ package pkgtree
66

77
import (
88
"fmt"
9-
"go/build"
109
"go/scanner"
1110
"go/token"
1211
"io/ioutil"
@@ -489,8 +488,9 @@ func TestListPackages(t *testing.T) {
489488
ImportRoot: "empty",
490489
Packages: map[string]PackageOrErr{
491490
"empty": {
492-
Err: &build.NoGoError{
493-
Dir: j("empty"),
491+
P: Package{
492+
ImportPath: "empty",
493+
Imports: []string{},
494494
},
495495
},
496496
},
@@ -733,8 +733,9 @@ func TestListPackages(t *testing.T) {
733733
ImportRoot: "ren",
734734
Packages: map[string]PackageOrErr{
735735
"ren": {
736-
Err: &build.NoGoError{
737-
Dir: j("ren"),
736+
P: Package{
737+
ImportPath: "ren",
738+
Imports: []string{},
738739
},
739740
},
740741
"ren/m1p": {
@@ -1653,8 +1654,9 @@ func TestListPackagesNoPerms(t *testing.T) {
16531654
ImportRoot: "ren",
16541655
Packages: map[string]PackageOrErr{
16551656
"ren": {
1656-
Err: &build.NoGoError{
1657-
Dir: workdir,
1657+
P: Package{
1658+
ImportPath: "ren",
1659+
Imports: []string{},
16581660
},
16591661
},
16601662
"ren/m1p": {
@@ -1690,10 +1692,6 @@ func TestListPackagesNoPerms(t *testing.T) {
16901692
}
16911693
}
16921694

1693-
if got.Packages["ren"].Err == nil {
1694-
t.Error("Should have gotten error on empty root directory")
1695-
}
1696-
16971695
if !reflect.DeepEqual(got.Packages["ren/m1p"].P.Imports, want.Packages["ren/m1p"].P.Imports) {
16981696
t.Error("Mismatch between imports in m1p")
16991697
}

0 commit comments

Comments
 (0)