Skip to content

G
golang
Commit dd84cf4e authored by Russ Cox's avatar Russ Cox
Browse files
Options

cmd/go: install dependencies for 'go build -i' on a command 

Fixes #8242.

LGTM=r
R=golang-codereviews, r
CC=golang-codereviews, iant
https://golang.org/cl/147150043
parent 2fa3e43f
Hide whitespace changes
Inline Side-by-side
Showing with 78 additions and 47 deletions
src/cmd/go/build.go
View file @ dd84cf4e
...@@ -284,6 +284,11 @@ func runBuild(cmd *Command, args []string) { ...@@ -284,6 +284,11 @@ func runBuild(cmd *Command, args []string) {
} }
} }
depMode := modeBuild
if buildI {
depMode = modeInstall
}
if *buildO != "" { if *buildO != "" {
if len(pkgs) > 1 { if len(pkgs) > 1 {
fatalf("go build: cannot use -o with multiple packages") fatalf("go build: cannot use -o with multiple packages")
...@@ -292,17 +297,13 @@ func runBuild(cmd *Command, args []string) { ...@@ -292,17 +297,13 @@ func runBuild(cmd *Command, args []string) {
} }
p := pkgs[0] p := pkgs[0]
p.target = "" // must build - not up to date p.target = "" // must build - not up to date
a := b.action(modeInstall, modeBuild, p) a := b.action(modeInstall, depMode, p)
a.target = *buildO a.target = *buildO
b.do(a) b.do(a)
return return
} }
a := &action{} a := &action{}
depMode := modeBuild
if buildI {
depMode = modeInstall
}
for _, p := range packages(args) { for _, p := range packages(args) {
a.deps = append(a.deps, b.action(modeBuild, depMode, p)) a.deps = append(a.deps, b.action(modeBuild, depMode, p))
} }
......
src/cmd/go/test.bash
View file @ dd84cf4e
...@@ -11,11 +11,15 @@ go() { ...@@ -11,11 +11,15 @@ go() {
} }
started=false started=false
testdesc=""
nl="
"
TEST() { TEST() {
if $started; then if $started; then
stop stop
fi fi
echo TEST: "$@" echo TEST: "$@"
testdesc="$@"
started=true started=true
ok=true ok=true
} }
...@@ -29,6 +33,7 @@ stop() { ...@@ -29,6 +33,7 @@ stop() {
echo PASS echo PASS
else else
echo FAIL echo FAIL
testfail="$testfail $testdesc$nl"
allok=false allok=false
fi fi
} }
...@@ -59,8 +64,8 @@ rm -r $d ...@@ -59,8 +64,8 @@ rm -r $d
testlocal() { testlocal() {
local="$1" local="$1"
TEST local imports $2 '(easy)' TEST local imports $2 '(easy)'
./testgo build -o hello "testdata/$local/easy.go" ./testgo build -o hello "testdata/$local/easy.go" || ok=false
./hello >hello.out ./hello >hello.out || ok=false
if ! grep -q '^easysub\.Hello' hello.out; then if ! grep -q '^easysub\.Hello' hello.out; then
echo "testdata/$local/easy.go did not generate expected output" echo "testdata/$local/easy.go did not generate expected output"
cat hello.out cat hello.out
...@@ -68,8 +73,8 @@ testlocal() { ...@@ -68,8 +73,8 @@ testlocal() {
fi fi
TEST local imports $2 '(easysub)' TEST local imports $2 '(easysub)'
./testgo build -o hello "testdata/$local/easysub/main.go" ./testgo build -o hello "testdata/$local/easysub/main.go" || ok=false
./hello >hello.out ./hello >hello.out || ok=false
if ! grep -q '^easysub\.Hello' hello.out; then if ! grep -q '^easysub\.Hello' hello.out; then
echo "testdata/$local/easysub/main.go did not generate expected output" echo "testdata/$local/easysub/main.go did not generate expected output"
cat hello.out cat hello.out
...@@ -77,8 +82,8 @@ testlocal() { ...@@ -77,8 +82,8 @@ testlocal() {
fi fi
TEST local imports $2 '(hard)' TEST local imports $2 '(hard)'
./testgo build -o hello "testdata/$local/hard.go" ./testgo build -o hello "testdata/$local/hard.go" || ok=false
./hello >hello.out ./hello >hello.out || ok=false
if ! grep -q '^sub\.Hello' hello.out || ! grep -q '^subsub\.Hello' hello.out ; then if ! grep -q '^sub\.Hello' hello.out || ! grep -q '^subsub\.Hello' hello.out ; then
echo "testdata/$local/hard.go did not generate expected output" echo "testdata/$local/hard.go did not generate expected output"
cat hello.out cat hello.out
...@@ -317,20 +322,20 @@ TEST godoc installs into GOBIN ...@@ -317,20 +322,20 @@ TEST godoc installs into GOBIN
d=$(mktemp -d -t testgoXXX) d=$(mktemp -d -t testgoXXX)
export GOPATH=$d export GOPATH=$d
mkdir $d/gobin mkdir $d/gobin
GOBIN=$d/gobin ./testgo get code.google.com/p/go.tools/cmd/godoc GOBIN=$d/gobin ./testgo get code.google.com/p/go.tools/cmd/godoc || ok=false
if [ ! -x $d/gobin/godoc ]; then if [ ! -x $d/gobin/godoc ]; then
echo did not install godoc to '$GOBIN' echo did not install godoc to '$GOBIN'
GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' code.google.com/p/go.tools/cmd/godoc GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' code.google.com/p/go.tools/cmd/godoc || true
ok=false ok=false
fi fi
TEST godoc installs into GOROOT TEST godoc installs into GOROOT
GOROOT=$(./testgo env GOROOT) GOROOT=$(./testgo env GOROOT)
rm -f $GOROOT/bin/godoc rm -f $GOROOT/bin/godoc
./testgo install code.google.com/p/go.tools/cmd/godoc ./testgo install code.google.com/p/go.tools/cmd/godoc || ok=false
if [ ! -x $GOROOT/bin/godoc ]; then if [ ! -x $GOROOT/bin/godoc ]; then
echo did not install godoc to '$GOROOT/bin' echo did not install godoc to '$GOROOT/bin'
./testgo list -f 'Target: {{.Target}}' code.google.com/p/go.tools/cmd/godoc ./testgo list -f 'Target: {{.Target}}' code.google.com/p/go.tools/cmd/godoc || true
ok=false ok=false
fi fi
...@@ -338,36 +343,36 @@ TEST cmd/fix installs into tool ...@@ -338,36 +343,36 @@ 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}/fix rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix
./testgo install cmd/fix ./testgo install cmd/fix || ok=false
if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then
echo 'did not install cmd/fix to $GOROOT/pkg/tool' echo 'did not install cmd/fix to $GOROOT/pkg/tool'
GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/fix GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/fix || true
ok=false ok=false
fi fi
rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix rm -f $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix
GOBIN=$d/gobin ./testgo install cmd/fix GOBIN=$d/gobin ./testgo install cmd/fix || ok=false
if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then if [ ! -x $GOROOT/pkg/tool/${GOOS}_${GOARCH}/fix ]; then
echo 'did not install cmd/fix 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/fix GOBIN=$d/gobin ./testgo list -f 'Target: {{.Target}}' cmd/fix || true
ok=false ok=false
fi fi
TEST gopath program installs into GOBIN TEST gopath program installs into GOBIN
mkdir $d/src/progname mkdir $d/src/progname
echo 'package main; func main() {}' >$d/src/progname/p.go echo 'package main; func main() {}' >$d/src/progname/p.go
GOBIN=$d/gobin ./testgo install progname GOBIN=$d/gobin ./testgo install progname || ok=false
if [ ! -x $d/gobin/progname ]; then if [ ! -x $d/gobin/progname ]; then
echo 'did not install progname to $GOBIN/progname' echo 'did not install progname to $GOBIN/progname'
./testgo list -f 'Target: {{.Target}}' cmd/api ./testgo list -f 'Target: {{.Target}}' cmd/api || true
ok=false ok=false
fi fi
rm -f $d/gobin/progname $d/bin/progname rm -f $d/gobin/progname $d/bin/progname
TEST gopath program installs into GOPATH/bin TEST gopath program installs into GOPATH/bin
./testgo install progname ./testgo install progname || ok=false
if [ ! -x $d/bin/progname ]; then if [ ! -x $d/bin/progname ]; then
echo 'did not install progname to $GOPATH/bin/progname' echo 'did not install progname to $GOPATH/bin/progname'
./testgo list -f 'Target: {{.Target}}' progname ./testgo list -f 'Target: {{.Target}}' progname || true
ok=false ok=false
fi fi
...@@ -396,7 +401,7 @@ fi ...@@ -396,7 +401,7 @@ fi
# ensure that output of 'go list' is consistent between runs # ensure that output of 'go list' is consistent between runs
TEST go list is consistent TEST go list is consistent
./testgo list std > test_std.list ./testgo list std > test_std.list || ok=false
if ! ./testgo list std | cmp -s test_std.list - ; then if ! ./testgo list std | cmp -s test_std.list - ; then
echo "go list std ordering is inconsistent" echo "go list std ordering is inconsistent"
ok=false ok=false
...@@ -470,7 +475,7 @@ func main() { ...@@ -470,7 +475,7 @@ func main() {
println(extern) println(extern)
} }
EOF EOF
./testgo run -ldflags '-X main.extern "hello world"' $d/main.go 2>hello.out ./testgo run -ldflags '-X main.extern "hello world"' $d/main.go 2>hello.out || ok=false
if ! grep -q '^hello world' hello.out; then if ! grep -q '^hello world' hello.out; then
echo "ldflags -X main.extern 'hello world' failed. Output:" echo "ldflags -X main.extern 'hello world' failed. Output:"
cat hello.out cat hello.out
...@@ -608,28 +613,36 @@ TEST shadowing logic ...@@ -608,28 +613,36 @@ TEST shadowing logic
export GOPATH=$(pwd)/testdata/shadow/root1:$(pwd)/testdata/shadow/root2 export GOPATH=$(pwd)/testdata/shadow/root1:$(pwd)/testdata/shadow/root2
# The math in root1 is not "math" because the standard math is. # The math in root1 is not "math" because the standard math is.
set +e
cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/math) cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/math)
set -e
if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/math)" ]; then if [ "$cdir" != "(_$(pwd)/testdata/shadow/root1/src/math) ($GOROOT/src/math)" ]; then
echo shadowed math is not shadowed: "$cdir" echo shadowed math is not shadowed: "$cdir"
ok=false ok=false
fi fi
# The foo in root1 is "foo". # The foo in root1 is "foo".
set +e
cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/foo) cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root1/src/foo)
set -e
if [ "$cdir" != "(foo) ()" ]; then if [ "$cdir" != "(foo) ()" ]; then
echo unshadowed foo is shadowed: "$cdir" echo unshadowed foo is shadowed: "$cdir"
ok=false ok=false
fi fi
# The foo in root2 is not "foo" because the foo in root1 got there first. # The foo in root2 is not "foo" because the foo in root1 got there first.
set +e
cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root2/src/foo) cdir=$(./testgo list -f '({{.ImportPath}}) ({{.ConflictDir}})' ./testdata/shadow/root2/src/foo)
set -e
if [ "$cdir" != "(_$(pwd)/testdata/shadow/root2/src/foo) ($(pwd)/testdata/shadow/root1/src/foo)" ]; then if [ "$cdir" != "(_$(pwd)/testdata/shadow/root2/src/foo) ($(pwd)/testdata/shadow/root1/src/foo)" ]; then
echo shadowed foo is not shadowed: "$cdir" echo shadowed foo is not shadowed: "$cdir"
ok=false ok=false
fi fi
# The error for go install should mention the conflicting directory. # The error for go install should mention the conflicting directory.
err=$(! ./testgo install ./testdata/shadow/root2/src/foo 2>&1) set +e
err=$(./testgo install ./testdata/shadow/root2/src/foo 2>&1)
set -e
if [ "$err" != "go install: no install location for $(pwd)/testdata/shadow/root2/src/foo: hidden by $(pwd)/testdata/shadow/root1/src/foo" ]; then if [ "$err" != "go install: no install location for $(pwd)/testdata/shadow/root2/src/foo: hidden by $(pwd)/testdata/shadow/root1/src/foo" ]; then
echo wrong shadowed install error: "$err" echo wrong shadowed install error: "$err"
ok=false ok=false
...@@ -818,30 +831,46 @@ echo ' ...@@ -818,30 +831,46 @@ echo '
package foo package foo
func F() {} func F() {}
' >$d/src/x/y/foo/foo.go ' >$d/src/x/y/foo/foo.go
checkbar() {
desc="$1"
sleep 1
touch $d/src/x/y/foo/foo.go
if ! ./testgo build -v -i x/y/bar &> $d/err; then
echo build -i "$1" failed
cat $d/err
ok=false
elif ! grep x/y/foo $d/err >/dev/null; then
echo first build -i "$1" did not build x/y/foo
cat $d/err
ok=false
fi
if ! ./testgo build -v -i x/y/bar &> $d/err; then
echo second build -i "$1" failed
cat $d/err
ok=false
elif grep x/y/foo $d/err >/dev/null; then
echo second build -i "$1" built x/y/foo
cat $d/err
ok=false
fi
}
echo ' echo '
package bar package bar
import "x/y/foo" import "x/y/foo"
func F() { foo.F() } func F() { foo.F() }
' >$d/src/x/y/bar/bar.go ' >$d/src/x/y/bar/bar.go
if ! ./testgo build -v -i x/y/bar &> $d/err; then checkbar pkg
echo build -i failed
cat $d/err TEST build -i installs dependencies for command
ok=false echo '
elif ! grep x/y/foo $d/err >/dev/null; then package main
echo first build -i did not build x/y/foo import "x/y/foo"
cat $d/err func main() { foo.F() }
ok=false ' >$d/src/x/y/bar/bar.go
fi checkbar cmd
if ! ./testgo build -v -i x/y/bar &> $d/err; then
echo second build -i failed rm -rf $d bar
cat $d/err
ok=false
elif grep x/y/foo $d/err >/dev/null; then
echo second build -i built x/y/foo
cat $d/err
ok=false
fi
rm -rf $d
unset GOPATH unset GOPATH
TEST 'go build in test-only directory fails with a good error' TEST 'go build in test-only directory fails with a good error'
...@@ -876,7 +905,7 @@ fi ...@@ -876,7 +905,7 @@ fi
TEST 'go test xtestonly works' TEST 'go test xtestonly works'
export GOPATH=$(pwd)/testdata export GOPATH=$(pwd)/testdata
./testgo clean -i xtestonly ./testgo clean -i xtestonly || ok=false
if ! ./testgo test xtestonly >/dev/null; then if ! ./testgo test xtestonly >/dev/null; then
echo "go test xtestonly failed" echo "go test xtestonly failed"
ok=false ok=false
...@@ -927,6 +956,7 @@ rm -f testgo ...@@ -927,6 +956,7 @@ rm -f testgo
if $allok; then if $allok; then
echo PASS echo PASS
else else
echo FAIL echo FAIL:
echo "$testfail"
exit 1 exit 1
fi fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment