build, cmd/5l: actually report failures for -linkmode tests

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/7938046

diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c
index 1bcf436c43bb72ac26355c33454c9a163cc59168..d38da204a373c304fc943649020b0df78316cd98 100644 (file)
--- a/src/cmd/5l/obj.c
+++ b/src/cmd/5l/obj.c
@@ -136,9 +136,11 @@ main(int argc, char *argv[])
        if(argc != 1)
                usage();
 
-       if(linkmode != LinkInternal) {
+       if(linkmode == LinkExternal) {
                diag("only -linkmode=internal is supported");
                errorexit();
+       } else if(linkmode == LinkAuto) {
+               linkmode = LinkInternal;
        }
 
        libinit();

diff --git a/src/run.bash b/src/run.bash
index 5f0af5f3f29db92c489bf06753c9beebfc2668aa..b7c89d96a7e31c92d325876508ed17e14359dde0 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -79,6 +79,7 @@ go run $GOROOT/test/run.go - .
 
 [ "$CGO_ENABLED" != 1 ] ||
 (xcd ../misc/cgo/test
+set -e
 go test -ldflags '-linkmode=auto'
 go test -ldflags '-linkmode=internal'
 case "$GOHOSTOS-$GOARCH" in