diff options
| author | Felix Lange <fjl@twurst.com> | 2017-03-23 22:46:03 +0800 |
|---|---|---|
| committer | Felix Lange <fjl@twurst.com> | 2017-03-23 22:50:05 +0800 |
| commit | e7911ad9ea38eaf8707b7247a5ac96bc81de856c (patch) | |
| tree | 91f58f53f8bcfa45f8141ca2b0bc721b0a9ca656 /build | |
| parent | 11e7a712f469fb24ddb88ecebcefab6ed8880eb8 (diff) | |
| download | dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar.gz dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar.bz2 dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar.lz dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar.xz dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.tar.zst dexon-e7911ad9ea38eaf8707b7247a5ac96bc81de856c.zip | |
build: unify vendor skipping logic
This fixes a recent bug where 'make geth' built everything instead of
just geth.
Diffstat (limited to 'build')
| -rw-r--r-- | build/ci.go | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/build/ci.go b/build/ci.go index 27589fc7f..fcdd33788 100644 --- a/build/ci.go +++ b/build/ci.go @@ -173,19 +173,7 @@ func doInstall(cmdline []string) { if flag.NArg() > 0 { packages = flag.Args() } - - // Resolve ./... manually and remove vendor/bazil/fuse (fuse is not in windows) - out, err := goTool("list", "./...").CombinedOutput() - if err != nil { - log.Fatalf("package listing failed: %v\n%s", err, string(out)) - } - packages = []string{} - for _, line := range strings.Split(string(out), "\n") { - if !strings.Contains(line, "vendor") { - packages = append(packages, strings.TrimSpace(line)) - } - } - + packages = build.ExpandPackagesNoVendor(packages) if *arch == "" || *arch == runtime.GOARCH { goinstall := goTool("install", buildFlags(env)...) @@ -284,19 +272,8 @@ func doTest(cmdline []string) { if len(flag.CommandLine.Args()) > 0 { packages = flag.CommandLine.Args() } - if len(packages) == 1 && packages[0] == "./..." { - // Resolve ./... manually since go vet will fail on vendored stuff - out, err := goTool("list", "./...").CombinedOutput() - if err != nil { - log.Fatalf("package listing failed: %v\n%s", err, string(out)) - } - packages = []string{} - for _, line := range strings.Split(string(out), "\n") { - if !strings.Contains(line, "vendor") { - packages = append(packages, strings.TrimSpace(line)) - } - } - } + packages = build.ExpandPackagesNoVendor(packages) + // Run analysis tools before the tests. if *vet { build.MustRun(goTool("vet", packages...)) |