From: Alex Brainman Date: Wed, 7 May 2014 06:34:21 +0000 (+1000) Subject: race.bash,race.bat: unset GOROOT_FINAL during tests X-Git-Tag: go1.3beta2~135 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5d25189d801d7e8bf2fe10ffe95d43dda648a6b0;p=gostls13.git race.bash,race.bat: unset GOROOT_FINAL during tests Just like run.* scripts do. Fixes race build. LGTM=dave, dvyukov R=dvyukov, dave CC=golang-codereviews https://golang.org/cl/98980043 --- diff --git a/src/race.bash b/src/race.bash index 18201f992c..1680c09e49 100755 --- a/src/race.bash +++ b/src/race.bash @@ -38,5 +38,11 @@ fi # golang.org/issue/5537 - we must build a race enabled cmd/cgo before trying to use it. go install -race cmd/cgo go install -race std + +# we must unset GOROOT_FINAL before tests, because runtime/debug requires +# correct access to source code, so if we have GOROOT_FINAL in effect, +# at least runtime/debug test will fail. +unset GOROOT_FINAL + go test -race -short std go test -race -run=nothingplease -bench=.* -benchtime=.1s -cpu=4 std diff --git a/src/race.bat b/src/race.bat index 64b2f59c15..8858c57b06 100644 --- a/src/race.bat +++ b/src/race.bat @@ -36,6 +36,12 @@ go install -race cmd/cgo echo # go install -race std go install -race std if errorlevel 1 goto fail + +:: we must unset GOROOT_FINAL before tests, because runtime/debug requires +:: correct access to source code, so if we have GOROOT_FINAL in effect, +:: at least runtime/debug test will fail. +set GOROOT_FINAL= + echo # go test -race -short std go test -race -short std if errorlevel 1 goto fail