diff options
| author | Jay Conrod <jayconrod@google.com> | 2019-12-11 13:16:35 -0500 |
|---|---|---|
| committer | Jay Conrod <jayconrod@google.com> | 2020-04-06 18:06:41 +0000 |
| commit | 74d6de03fd7db2c6faa7794620a9bcf0c4f018f2 (patch) | |
| tree | 204c67aaa8e82be30da6fe004b68345d8c8a9405 /src/cmd/go/internal/load/test.go | |
| parent | 7dc1c62cc9eb7a8c0c554dd6d67da9bd4ddeac1c (diff) | |
| download | go-tls.tar.gz go-tls.zip | |
cmd/go: report scan error position in 'go list -e'tls
This CL extracts some error handling code into a common method for
presenting errors encountered when loading package data.
Fixes #36087
Fixes #36762
Change-Id: I87c8d41e3cc6e6afa152d9c067bc60923bf19fbe
Reviewed-on: https://go-review.googlesource.com/c/go/+/210938
Run-TryBot: Jay Conrod <jayconrod@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Michael Matloob <matloob@golang.org>
Reviewed-by: Bryan C. Mills <bcmills@google.com>
Diffstat (limited to 'src/cmd/go/internal/load/test.go')
| -rw-r--r-- | src/cmd/go/internal/load/test.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/cmd/go/internal/load/test.go b/src/cmd/go/internal/load/test.go index 6465f46f4e..1c0d01c16c 100644 --- a/src/cmd/go/internal/load/test.go +++ b/src/cmd/go/internal/load/test.go @@ -6,7 +6,6 @@ package load import ( "bytes" - "cmd/go/internal/base" "cmd/go/internal/str" "errors" "fmt" @@ -271,7 +270,9 @@ func TestPackagesAndErrors(p *Package, cover *TestCover) (pmain, ptest, pxtest * // afterward that gathers t.Cover information. t, err := loadTestFuncs(ptest) if err != nil && pmain.Error == nil { - pmain.Error = &PackageError{Err: err} + _ = pmain.setLoadPackageDataError(err, p.ImportPath, &stk) + // Ignore return value. None of the errors from loadTestFuncs should prevent + // us from loading information about imports. } t.Cover = cover if len(ptest.GoFiles)+len(ptest.CgoFiles) > 0 { @@ -540,7 +541,7 @@ var testFileSet = token.NewFileSet() func (t *testFuncs) load(filename, pkg string, doImport, seen *bool) error { f, err := parser.ParseFile(testFileSet, filename, nil, parser.ParseComments) if err != nil { - return base.ExpandScanner(err) + return err } for _, d := range f.Decls { n, ok := d.(*ast.FuncDecl) |