mirror of
https://github.com/golang/go
synced 2024-11-18 16:54:43 -07:00
cmd/go: proper rebuild of affected packages during go test
With this CL, go test -short -cover std successfully builds and runs all the standard package tests. The tests that look a file line numbers (log and runtime/debug) fail, because cover is not inserting //line directives. Everything else passes. ok cmd/api 0.038s coverage: 66.6% of statements ? cmd/cgo [no test files] ok cmd/fix 0.043s coverage: 27.2% of statements ok cmd/go 0.063s coverage: 2.4% of statements ? cmd/godoc [no test files] ok cmd/gofmt 0.085s coverage: 61.3% of statements ? cmd/yacc [no test files] ok archive/tar 0.023s coverage: 74.2% of statements ok archive/zip 0.075s coverage: 71.8% of statements ok bufio 0.149s coverage: 88.2% of statements ok bytes 0.135s coverage: 90.4% of statements ok compress/bzip2 0.087s coverage: 85.1% of statements ok compress/flate 0.632s coverage: 79.3% of statements ok compress/gzip 0.027s coverage: 76.7% of statements ok compress/lzw 0.141s coverage: 71.2% of statements ok compress/zlib 1.123s coverage: 77.2% of statements ok container/heap 0.020s coverage: 85.8% of statements ok container/list 0.021s coverage: 92.5% of statements ok container/ring 0.030s coverage: 86.5% of statements ? crypto [no test files] ok crypto/aes 0.054s coverage: 54.3% of statements ok crypto/cipher 0.027s coverage: 68.8% of statements ok crypto/des 0.041s coverage: 83.8% of statements ok crypto/dsa 0.027s coverage: 33.1% of statements ok crypto/ecdsa 0.048s coverage: 48.7% of statements ok crypto/elliptic 0.030s coverage: 91.6% of statements ok crypto/hmac 0.019s coverage: 83.3% of statements ok crypto/md5 0.020s coverage: 78.7% of statements ok crypto/rand 0.057s coverage: 20.8% of statements ok crypto/rc4 0.092s coverage: 70.8% of statements ok crypto/rsa 0.261s coverage: 80.8% of statements ok crypto/sha1 0.019s coverage: 83.9% of statements ok crypto/sha256 0.021s coverage: 89.0% of statements ok crypto/sha512 0.023s coverage: 88.7% of statements ok crypto/subtle 0.027s coverage: 83.9% of statements ok crypto/tls 0.833s coverage: 79.7% of statements ok crypto/x509 0.961s coverage: 74.9% of statements ? crypto/x509/pkix [no test files] ok database/sql 0.033s coverage: 75.0% of statements ok database/sql/driver 0.020s coverage: 46.2% of statements ok debug/dwarf 0.023s coverage: 71.5% of statements ok debug/elf 0.035s coverage: 58.2% of statements ok debug/gosym 0.022s coverage: 1.8% of statements ok debug/macho 0.023s coverage: 63.7% of statements ok debug/pe 0.024s coverage: 50.5% of statements ok encoding/ascii85 0.021s coverage: 89.7% of statements ok encoding/asn1 0.022s coverage: 77.9% of statements ok encoding/base32 0.022s coverage: 91.4% of statements ok encoding/base64 0.020s coverage: 90.7% of statements ok encoding/binary 0.022s coverage: 66.2% of statements ok encoding/csv 0.022s coverage: 88.5% of statements ok encoding/gob 0.064s coverage: 82.2% of statements ok encoding/hex 0.019s coverage: 86.3% of statements ok encoding/json 0.047s coverage: 77.3% of statements ok encoding/pem 0.026s coverage: 80.5% of statements ok encoding/xml 0.039s coverage: 85.0% of statements ok errors 0.022s coverage: 100.0% of statements ok expvar 0.048s coverage: 72.0% of statements ok flag 0.019s coverage: 86.9% of statements ok fmt 0.062s coverage: 91.2% of statements ok go/ast 0.028s coverage: 46.3% of statements ok go/build 0.190s coverage: 75.4% of statements ok go/doc 0.095s coverage: 76.7% of statements ok go/format 0.036s coverage: 79.8% of statements ok go/parser 0.075s coverage: 82.0% of statements ok go/printer 0.733s coverage: 88.6% of statements ok go/scanner 0.031s coverage: 86.5% of statements ok go/token 0.062s coverage: 79.7% of statements ? hash [no test files] ok hash/adler32 0.029s coverage: 49.0% of statements ok hash/crc32 0.020s coverage: 64.2% of statements ok hash/crc64 0.021s coverage: 53.5% of statements ok hash/fnv 0.018s coverage: 75.5% of statements ok html 0.022s coverage: 4.5% of statements ok html/template 0.087s coverage: 83.9% of statements ok image 0.108s coverage: 67.1% of statements ok image/color 0.026s coverage: 20.1% of statements ok image/draw 0.049s coverage: 69.6% of statements ok image/gif 0.019s coverage: 65.2% of statements ok image/jpeg 0.197s coverage: 78.6% of statements ok image/png 0.055s coverage: 56.5% of statements ok index/suffixarray 0.027s coverage: 82.4% of statements ok io 0.037s coverage: 83.4% of statements ok io/ioutil 0.022s coverage: 70.1% of statements FAIL log 0.020s ok log/syslog 2.063s coverage: 71.1% of statements ok math 0.023s coverage: 76.5% of statements ok math/big 0.235s coverage: 79.2% of statements ok math/cmplx 0.020s coverage: 66.5% of statements ok math/rand 0.031s coverage: 69.9% of statements ok mime 0.022s coverage: 83.0% of statements ok mime/multipart 0.389s coverage: 76.1% of statements ok net 2.219s coverage: 58.0% of statements ok net/http 4.744s coverage: 82.9% of statements ok net/http/cgi 0.593s coverage: 68.5% of statements ok net/http/cookiejar 0.038s coverage: 90.3% of statements ok net/http/fcgi 0.047s coverage: 37.6% of statements ok net/http/httptest 0.068s coverage: 68.9% of statements ok net/http/httputil 0.058s coverage: 52.8% of statements ? net/http/pprof [no test files] ok net/mail 0.025s coverage: 80.3% of statements ok net/rpc 0.063s coverage: 71.5% of statements ok net/rpc/jsonrpc 0.047s coverage: 81.3% of statements ok net/smtp 0.032s coverage: 74.1% of statements ok net/textproto 0.023s coverage: 66.0% of statements ok net/url 0.020s coverage: 78.2% of statements ok os 4.729s coverage: 73.3% of statements ok os/exec 39.620s coverage: 65.1% of statements ok os/signal 0.541s coverage: 89.9% of statements ok os/user 0.022s coverage: 62.2% of statements ok path 0.018s coverage: 90.8% of statements ok path/filepath 10.834s coverage: 88.4% of statements ok reflect 0.055s coverage: 83.2% of statements ok regexp 0.084s coverage: 75.5% of statements ok regexp/syntax 0.547s coverage: 85.2% of statements ok runtime 4.755s coverage: 75.9% of statements ? runtime/cgo [no test files] FAIL runtime/debug 0.018s ok runtime/pprof 0.368s coverage: 8.5% of statements ? runtime/race [no test files] ok sort 0.059s coverage: 97.7% of statements ok strconv 0.315s coverage: 95.6% of statements ok strings 0.147s coverage: 96.1% of statements ok sync 0.083s coverage: 56.7% of statements ok sync/atomic 0.035s coverage: 0.0% of statements ok syscall 0.043s coverage: 24.0% of statements ok testing 0.018s coverage: 24.0% of statements ? testing/iotest [no test files] ok testing/quick 0.062s coverage: 83.2% of statements ok text/scanner 0.020s coverage: 91.5% of statements ok text/tabwriter 0.021s coverage: 90.4% of statements ok text/template 0.052s coverage: 81.1% of statements ok text/template/parse 0.024s coverage: 86.1% of statements ok time 2.431s coverage: 88.8% of statements ok unicode 0.024s coverage: 92.1% of statements ok unicode/utf16 0.017s coverage: 97.3% of statements ok unicode/utf8 0.019s coverage: 97.4% of statements ? unsafe [no test files] R=golang-dev, r CC=golang-dev https://golang.org/cl/10586043
This commit is contained in:
Russ Cox
parent
4850f5d5ea
commit
8b9c1a224b
@ -570,8 +570,12 @@ func (b *builder) action(mode buildMode, depMode buildMode, p *Package) *action
|
||||
// Imported via local path. No permanent target.
|
||||
mode = modeBuild
|
||||
}
|
||||
a.objdir = filepath.Join(b.work, a.p.ImportPath, "_obj") + string(filepath.Separator)
|
||||
a.objpkg = buildToolchain.pkgpath(b.work, a.p)
|
||||
work := p.pkgdir
|
||||
if work == "" {
|
||||
work = b.work
|
||||
}
|
||||
a.objdir = filepath.Join(work, a.p.ImportPath, "_obj") + string(filepath.Separator)
|
||||
a.objpkg = buildToolchain.pkgpath(work, a.p)
|
||||
a.link = p.Name == "main"
|
||||
|
||||
switch mode {
|
||||
|
||||
@ -493,19 +493,6 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
|
||||
return nil, nil, nil, p1.Error
|
||||
}
|
||||
ximports = append(ximports, p1)
|
||||
|
||||
// In coverage mode, we rewrite the package p's sources.
|
||||
// All code that imports p must be rebuilt with the updated
|
||||
// copy, or else coverage will at the least be incomplete
|
||||
// (and sometimes we get link errors due to the mismatch as well).
|
||||
// The external test itself imports package p, of course, but
|
||||
// we make sure that sees the new p. Any other code in the test
|
||||
// - that is, any code imported by the external test that in turn
|
||||
// imports p - needs to be rebuilt too. For now, just report
|
||||
// that coverage is unavailable.
|
||||
if testCover && contains(p1.Deps, p.ImportPath) {
|
||||
return nil, nil, nil, fmt.Errorf("coverage analysis cannot handle package (%s_test imports %s imports %s)", p.Name, path, p.ImportPath)
|
||||
}
|
||||
}
|
||||
stk.pop()
|
||||
|
||||
@ -544,15 +531,6 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
|
||||
if testCover {
|
||||
p.coverMode = testCoverMode
|
||||
p.coverVars = declareCoverVars(p.ImportPath, p.GoFiles...)
|
||||
}
|
||||
|
||||
if err := writeTestmain(filepath.Join(testDir, "_testmain.go"), p, p.coverVars); err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
|
||||
// Test package.
|
||||
if len(p.TestGoFiles) > 0 || testCover {
|
||||
ptest = new(Package)
|
||||
@ -581,6 +559,15 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
|
||||
ptest = p
|
||||
}
|
||||
|
||||
if testCover {
|
||||
ptest.coverMode = testCoverMode
|
||||
ptest.coverVars = declareCoverVars(ptest.ImportPath, ptest.GoFiles...)
|
||||
}
|
||||
|
||||
if err := writeTestmain(filepath.Join(testDir, "_testmain.go"), ptest, ptest.coverVars); err != nil {
|
||||
return nil, nil, nil, err
|
||||
}
|
||||
|
||||
// External test package.
|
||||
if len(p.XTestGoFiles) > 0 {
|
||||
pxtest = &Package{
|
||||
@ -628,6 +615,23 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
|
||||
return nil, nil, nil, pregexp.Error
|
||||
}
|
||||
pmain.imports = append(pmain.imports, ptesting, pregexp)
|
||||
|
||||
if ptest != p && testCover {
|
||||
// We have made modifications to the package p being tested
|
||||
// and are rebuilding p (as ptest), writing it to the testDir tree.
|
||||
// Arrange to rebuild, writing to that same tree, all packages q
|
||||
// such that the test depends on q and q depends on p.
|
||||
// This makes sure that q sees the modifications to p.
|
||||
// Strictly speaking, the rebuild is only necessary if the
|
||||
// modifications to p change its export metadata, but
|
||||
// determining that is a bit tricky, so we rebuild always.
|
||||
//
|
||||
// This will cause extra compilation, so for now we only do it
|
||||
// when testCover is set. The conditions are more general, though,
|
||||
// and we may find that we need to do it always in the future.
|
||||
recompileForTest(pmain, p, ptest, pxtest, testDir)
|
||||
}
|
||||
|
||||
computeStale(pmain)
|
||||
|
||||
if ptest != p {
|
||||
@ -686,6 +690,50 @@ func (b *builder) test(p *Package) (buildAction, runAction, printAction *action,
|
||||
return pmainAction, runAction, printAction, nil
|
||||
}
|
||||
|
||||
func recompileForTest(pmain, preal, ptest, pxtest *Package, testDir string) {
|
||||
m := map[*Package]*Package{preal: ptest}
|
||||
|
||||
var (
|
||||
clone func(*Package) *Package
|
||||
rewrite func(*Package)
|
||||
)
|
||||
|
||||
clone = func(p *Package) *Package {
|
||||
if p1 := m[p]; p1 != nil {
|
||||
// Already did the work.
|
||||
return p1
|
||||
}
|
||||
if !contains(p.Deps, preal.ImportPath) || p.pkgdir == testDir {
|
||||
// No work to do.
|
||||
return p
|
||||
}
|
||||
// Make new local copy of package.
|
||||
p1 := new(Package)
|
||||
m[p] = p1
|
||||
*p1 = *p
|
||||
p1.imports = make([]*Package, len(p.imports))
|
||||
copy(p1.imports, p.imports)
|
||||
rewrite(p1)
|
||||
return p1
|
||||
}
|
||||
|
||||
rewrite = func(p *Package) {
|
||||
p.pkgdir = testDir
|
||||
p.target = ""
|
||||
p.fake = true
|
||||
p.forceLibrary = true
|
||||
p.Stale = true
|
||||
for i, dep := range p.imports {
|
||||
p.imports[i] = clone(dep)
|
||||
}
|
||||
}
|
||||
|
||||
rewrite(pmain)
|
||||
if pxtest != nil {
|
||||
rewrite(pxtest)
|
||||
}
|
||||
}
|
||||
|
||||
var coverIndex = 0
|
||||
|
||||
// declareCoverVars attaches the required cover variables names
|
||||
|
||||
Loading…
Reference in New Issue
Block a user