qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 08:58:09 -07:00
Code Releases Activity

cmd/go: cgo programs depend on syscall

Browse Source 
Fixes #5048.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/12651044
This commit is contained in:
Russ Cox 2013-08-09 09:03:25 -04:00
parent 01f1e3da48
commit b0a1b82ec1
2 changed files with 56 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/cmd/go/pkg.go
View File

@ -323,6 +323,23 @@ func expandScanner(err error) error {
return err return err
} }
var raceExclude = map[string]bool{
"runtime/race": true,
"runtime/cgo": true,
"cmd/cgo": true,
"syscall": true,
"errors": true,
}
var cgoExclude = map[string]bool{
"runtime/cgo": true,
}
var cgoSyscallExclude = map[string]bool{
"runtime/cgo": true,
"runtime/race": true,
}
// load populates p using information from bp, err, which should // load populates p using information from bp, err, which should
// be the result of calling build.Context.Import. // be the result of calling build.Context.Import.
func (p *Package) load(stk *importStack, bp *build.Package, err error) *Package { func (p *Package) load(stk *importStack, bp *build.Package, err error) *Package {
@ -375,17 +392,22 @@ func (p *Package) load(stk *importStack, bp *build.Package, err error) *Package
} }
importPaths := p.Imports importPaths := p.Imports
// Packages that use cgo import runtime/cgo implicitly, // Packages that use cgo import runtime/cgo implicitly.
// except runtime/cgo itself. // Packages that use cgo also import syscall implicitly,
if len(p.CgoFiles) > 0 && (!p.Standard || p.ImportPath != "runtime/cgo") { // to wrap errno.
// Exclude certain packages to avoid circular dependencies.
if len(p.CgoFiles) > 0 && (!p.Standard || !cgoExclude[p.ImportPath]) {
importPaths = append(importPaths, "runtime/cgo") importPaths = append(importPaths, "runtime/cgo")
} }
if len(p.CgoFiles) > 0 && (!p.Standard || !cgoSyscallExclude[p.ImportPath]) {
importPaths = append(importPaths, "syscall")
}
// Everything depends on runtime, except runtime and unsafe. // Everything depends on runtime, except runtime and unsafe.
if !p.Standard || (p.ImportPath != "runtime" && p.ImportPath != "unsafe") { if !p.Standard || (p.ImportPath != "runtime" && p.ImportPath != "unsafe") {
importPaths = append(importPaths, "runtime") importPaths = append(importPaths, "runtime")
// When race detection enabled everything depends on runtime/race. // When race detection enabled everything depends on runtime/race.
// Exclude runtime/cgo and cmd/cgo to avoid circular dependencies. // Exclude certain packages to avoid circular dependencies.
if buildRace && (!p.Standard || (p.ImportPath != "runtime/race" && p.ImportPath != "runtime/cgo" && p.ImportPath != "cmd/cgo")) { if buildRace && (!p.Standard || !raceExclude[p.ImportPath]) {
importPaths = append(importPaths, "runtime/race") importPaths = append(importPaths, "runtime/race")
} }
} }

44
src/cmd/go/test.bash
View File

@ -186,21 +186,21 @@ if [ ! -x $GOROOT/bin/godoc ]; then
ok=false ok=false
fi fi
TEST cmd/api installs into tool TEST cmd/fix installs into tool
GOOS=$(./testgo env GOOS) GOOS=$(./testgo env GOOS)
GOARCH=$(./testgo env GOARCH) GOARCH=$(./testgo env GOARCH)
rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/api rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix
./testgo install cmd/api ./testgo install cmd/fix
if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/api ]; then if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then
echo 'did not install cmd/api to $GOROOT/pkg/tool' echo 'did not install cmd/fix to $GOROOT/pkg/tool'
GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/api GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/fix
ok=false ok=false
fi fi
rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/api rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix
GOBIN=$d/gobin ./testgo install cmd/api GOBIN=$d/gobin ./testgo install cmd/fix
if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/api ]; then if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then
echo 'did not install cmd/api to $GOROOT/pkg/tool with $GOBIN set' echo 'did not install cmd/fix to $GOROOT/pkg/tool with $GOBIN set'
GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/api GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/fix
ok=false ok=false
fi fi
@ -434,20 +434,34 @@ elif ! grep "case-insensitive file name collision" $d/out >/dev/null; then
fi fi
TEST go get cover TEST go get cover
./testgo get code.google.com/p/go.tools/cmd/cover ./testgo get code.google.com/p/go.tools/cmd/cover || ok=false
unset GOPATH unset GOPATH
rm -rf $d rm -rf $d
# Only succeeds if source order is preserved. # Only succeeds if source order is preserved.
TEST source file name order preserved TEST source file name order preserved
./testgo test testdata/example[12]_test.go ./testgo test testdata/example[12]_test.go || ok=false
# Check that coverage analysis works at all. # Check that coverage analysis works at all.
# Don't worry about the exact numbers # Don't worry about the exact numbers
TEST coverage runs TEST coverage runs
./testgo test -short -coverpkg=strings strings regexp ./testgo test -short -coverpkg=strings strings regexp || ok=false
./testgo test -short -cover strings math regexp ./testgo test -short -cover strings math regexp || ok=false
TEST cgo depends on syscall
rm -rf $GOROOT/pkg/*_race
d=$(TMPDIR=/var/tmp mktemp -d -t testgoXXX)
export GOPATH=$d
mkdir -p $d/src/foo
echo '
package foo
//#include <stdio.h>
import "C"
' >$d/src/foo/foo.go
./testgo build -race foo || ok=false
rm -rf $d
unset GOPATH
# clean up # clean up
if $started; then stop; fi if $started; then stop; fi