[dev.fuzz] all: merge master (7764ee5) into dev.fuzz

[gostls13.git] / src / cmd / go / internal / load / test.go

diff --git a/src/cmd/go/internal/load/test.go b/src/cmd/go/internal/load/test.go
index 5053ad767bc4b63d36c7088156be05a3b55f19c3..f5d66290922ac977eac93305250013b3f9f839f8 100644 (file)
--- a/src/cmd/go/internal/load/test.go
+++ b/src/cmd/go/internal/load/test.go
@@ -124,12 +124,14 @@ func TestPackagesAndErrors(ctx context.Context, p *Package, cover *TestCover) (p
                imports = append(imports, p1)
        }
        var err error
-       p.TestEmbedFiles, testEmbed, err = p.resolveEmbed(p.TestEmbedPatterns)
+       p.TestEmbedFiles, testEmbed, err = resolveEmbed(p.Dir, p.TestEmbedPatterns)
        if err != nil && ptestErr == nil {
                ptestErr = &PackageError{
                        ImportStack: stk.Copy(),
                        Err:         err,
                }
+               embedErr := err.(*EmbedError)
+               ptestErr.setPos(p.Internal.Build.TestEmbedPatternPos[embedErr.Pattern])
        }
        stk.Pop()
 
@@ -145,12 +147,14 @@ func TestPackagesAndErrors(ctx context.Context, p *Package, cover *TestCover) (p
                }
                p.XTestImports[i] = p1.ImportPath
        }
-       p.XTestEmbedFiles, xtestEmbed, err = p.resolveEmbed(p.XTestEmbedPatterns)
+       p.XTestEmbedFiles, xtestEmbed, err = resolveEmbed(p.Dir, p.XTestEmbedPatterns)
        if err != nil && pxtestErr == nil {
                pxtestErr = &PackageError{
                        ImportStack: stk.Copy(),
                        Err:         err,
                }
+               embedErr := err.(*EmbedError)
+               pxtestErr.setPos(p.Internal.Build.XTestEmbedPatternPos[embedErr.Pattern])
        }
        stk.Pop()