synchronize ARM runner environment variable with run-arm

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

diff --git a/src/cmd/gotest/gotest b/src/cmd/gotest/gotest
index b5a21e74692a049c5dba823badb11fa23d42e816..3fca81b6a575e145ce7b2303643167f435e3c7c9 100755 (executable)
--- a/src/cmd/gotest/gotest
+++ b/src/cmd/gotest/gotest
@@ -38,7 +38,7 @@ esac
 # TODO(kaib): proper emulator strategy
 case x"$GOARCH" in
 xarm)
-       export E=${EMU_arm:-qemu-arm -cpu cortex-a8}
+       export E=${GORUN:-qemu-arm -cpu cortex-a8}
 esac
 
 # Allow overrides

diff --git a/test/run b/test/run
index 473bef1472f4fff757f737d3d5839f822c152191..78014c867f6222f43e6e96203bd14188afbbdcb7 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -13,7 +13,7 @@ X386)
        ;;
 Xarm)
        export A=5
-       export E=${EMU_arm:-qemu-arm -cpu cortex-a8}
+       export E=${GORUN:-qemu-arm -cpu cortex-a8}
        ;;
 *)
        echo 1>&2 run: unsupported '$GOARCH'