Commit 36119974 authored by Russ Cox's avatar Russ Cox

build: disable race external linking test on OS X 10.6 and earlier

External linking doesn't work there at all.

LGTM=bradfitz
R=adg, bradfitz
CC=golang-codereviews
https://golang.org/cl/176070043
parent 378c2515
...@@ -64,18 +64,6 @@ echo ...@@ -64,18 +64,6 @@ echo
echo '# sync -cpu=10' echo '# sync -cpu=10'
go test sync -short -timeout=$(expr 120 \* $timeout_scale)s -cpu=10 go test sync -short -timeout=$(expr 120 \* $timeout_scale)s -cpu=10
# Race detector only supported on Linux, FreeBSD and OS X,
# and only on amd64, and only when cgo is enabled.
case "$GOHOSTOS-$GOOS-$GOARCH-$CGO_ENABLED" in
linux-linux-amd64-1 | freebsd-freebsd-amd64-1 | darwin-darwin-amd64-1)
echo
echo '# Testing race detector.'
go test -race -i runtime/race flag os/exec
go test -race -run=Output runtime/race
go test -race -short flag os/exec
go test -race -short -ldflags=-linkmode=external flag os/exec
esac
xcd() { xcd() {
echo echo
echo '#' $1 echo '#' $1
...@@ -121,6 +109,7 @@ go run $GOROOT/test/run.go - . || exit 1 ...@@ -121,6 +109,7 @@ go run $GOROOT/test/run.go - . || exit 1
[ "$CGO_ENABLED" != 1 ] || [ "$CGO_ENABLED" != 1 ] ||
(xcd ../misc/cgo/test (xcd ../misc/cgo/test
# cgo tests inspect the traceback for runtime functions # cgo tests inspect the traceback for runtime functions
extlink=0
export GOTRACEBACK=2 export GOTRACEBACK=2
go test -ldflags '-linkmode=auto' || exit 1 go test -ldflags '-linkmode=auto' || exit 1
# linkmode=internal fails on dragonfly since errno is a TLS relocation. # linkmode=internal fails on dragonfly since errno is a TLS relocation.
...@@ -129,19 +118,24 @@ case "$GOHOSTOS-$GOARCH" in ...@@ -129,19 +118,24 @@ case "$GOHOSTOS-$GOARCH" in
openbsd-386 | openbsd-amd64) openbsd-386 | openbsd-amd64)
# test linkmode=external, but __thread not supported, so skip testtls. # test linkmode=external, but __thread not supported, so skip testtls.
go test -ldflags '-linkmode=external' || exit 1 go test -ldflags '-linkmode=external' || exit 1
extlink=1
;; ;;
darwin-386 | darwin-amd64) darwin-386 | darwin-amd64)
# linkmode=external fails on OS X 10.6 and earlier == Darwin # linkmode=external fails on OS X 10.6 and earlier == Darwin
# 10.8 and earlier. # 10.8 and earlier.
case $(uname -r) in case $(uname -r) in
[0-9].* | 10.*) ;; [0-9].* | 10.*) ;;
*) go test -ldflags '-linkmode=external' || exit 1;; *)
go test -ldflags '-linkmode=external' || exit 1
extlink=1
;;
esac esac
;; ;;
android-arm | dragonfly-386 | dragonfly-amd64 | freebsd-386 | freebsd-amd64 | freebsd-arm | linux-386 | linux-amd64 | linux-arm | netbsd-386 | netbsd-amd64) android-arm | dragonfly-386 | dragonfly-amd64 | freebsd-386 | freebsd-amd64 | freebsd-arm | linux-386 | linux-amd64 | linux-arm | netbsd-386 | netbsd-amd64)
go test -ldflags '-linkmode=external' || exit 1 go test -ldflags '-linkmode=external' || exit 1
go test -ldflags '-linkmode=auto' ../testtls || exit 1 go test -ldflags '-linkmode=auto' ../testtls || exit 1
go test -ldflags '-linkmode=external' ../testtls || exit 1 go test -ldflags '-linkmode=external' ../testtls || exit 1
extlink=1
case "$GOHOSTOS-$GOARCH" in case "$GOHOSTOS-$GOARCH" in
netbsd-386 | netbsd-amd64) ;; # no static linking netbsd-386 | netbsd-amd64) ;; # no static linking
...@@ -165,6 +159,23 @@ android-arm | dragonfly-386 | dragonfly-amd64 | freebsd-386 | freebsd-amd64 | fr ...@@ -165,6 +159,23 @@ android-arm | dragonfly-386 | dragonfly-amd64 | freebsd-386 | freebsd-amd64 | fr
esac esac
) || exit $? ) || exit $?
# Race detector only supported on Linux, FreeBSD and OS X,
# and only on amd64, and only when cgo is enabled.
# Delayed until here so we know whether to try external linking.
case "$GOHOSTOS-$GOOS-$GOARCH-$CGO_ENABLED" in
linux-linux-amd64-1 | freebsd-freebsd-amd64-1 | darwin-darwin-amd64-1)
echo
echo '# Testing race detector.'
go test -race -i runtime/race flag os/exec
go test -race -run=Output runtime/race
go test -race -short flag os/exec
# Test with external linking; see issue 9133.
if [ "$extlink" = 1 ]; then
go test -race -short -ldflags=-linkmode=external flag os/exec
fi
esac
# This tests cgo -cdefs. That mode is not supported, # This tests cgo -cdefs. That mode is not supported,
# so it's okay if it doesn't work on some systems. # so it's okay if it doesn't work on some systems.
# In particular, it works badly with clang on OS X. # In particular, it works badly with clang on OS X.
......
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