[release-branch.go1] build: unset GOROOT_FINAL before tests

««« backport 4ee28b87fb90
build: unset GOROOT_FINAL before tests
        Fix the builders.

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

»»»

diff --git a/src/run.bash b/src/run.bash
index c2a52a078ecb97d642625a589865b415dde1fc09..6619fc1fff87da69f933ff5bc99201dd9b0dc8c8 100755 (executable)
--- a/src/run.bash
+++ b/src/run.bash
@@ -24,6 +24,11 @@ else
        echo
 fi
 
+# 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
+
 echo '# Testing packages.'
 time go test std -short -timeout=120s
 echo

diff --git a/src/run.bat b/src/run.bat
index c7a1579728773b34b51f3990c94b0c07d2d0d461..3bf9e8fc7e6dfcfb704f63f7aed8a144d63f76f9 100644 (file)
--- a/src/run.bat
+++ b/src/run.bat
@@ -25,6 +25,11 @@ if errorlevel 1 goto fail
 echo.
 :norebuild
 
+:: 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 # Testing packages.
 go test std -short -timeout=120s
 if errorlevel 1 goto fail