From 976d99b9a883631af276a4cd8e0205095457b430 Mon Sep 17 00:00:00 2001 From: Shenghou Ma Date: Mon, 25 Mar 2013 03:18:05 +0800 Subject: [PATCH] build, cmd/5l: actually report failures for -linkmode tests R=golang-dev, rsc CC=golang-dev https://golang.org/cl/7938046 --- src/cmd/5l/obj.c | 4 +++- src/run.bash | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cmd/5l/obj.c b/src/cmd/5l/obj.c index 1bcf436c43..d38da204a3 100644 --- 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 5f0af5f3f2..b7c89d96a7 100755 --- 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 -- 2.50.0