run.bat: pass through all arguments to "go tool dist test"

nolocal is no longer needed after CL 647115. If we remove it, then
we can pass through all arguments to the Go command, which is
useful for running tests with additional flags, like -json or -v.

Change-Id: I5c48d9b90720c039bf2ec3d9213e7ce5cea33818
Reviewed-on: https://go-review.googlesource.com/c/go/+/647116
Reviewed-by: Damien Neil <dneil@google.com>
Auto-Submit: Damien Neil <dneil@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>

diff --git a/src/all.bat b/src/all.bat
index 016987f86ecb35899b76b02b23e6aab93bf9e469..0c4d5de70c6cc0833d29b3201eff555fadf4045a 100644 (file)
--- a/src/all.bat
+++ b/src/all.bat
@@ -13,7 +13,7 @@ exit /b 1
 \r
 call .\make.bat --no-banner --no-local\r
 if errorlevel 1 goto fail\r
-call .\run.bat --no-rebuild --no-local\r
+call .\run.bat --no-rebuild\r
 if errorlevel 1 goto fail\r
 "%GOTOOLDIR%/dist" banner\r
 goto :eof\r

diff --git a/src/run.bat b/src/run.bat
index 8815a1109f1ab4f8057615ceaa14d696f65ebc08..6a0ffe3af905ac6ac51b70be2bcbf5f9b33e652d 100644 (file)
--- a/src/run.bat
+++ b/src/run.bat
@@ -9,12 +9,7 @@ echo Must run run.bat from Go src directory after installing cmd/go.
 goto fail\r
 :ok\r
 \r
-:: Keep environment variables within this script\r
-:: unless invoked with --no-local.\r
-if x%1==x--no-local goto nolocal\r
-if x%2==x--no-local goto nolocal\r
 setlocal\r
-:nolocal\r
 \r
 set GOENV=off\r
 ..\bin\go tool dist env > env.bat\r
@@ -23,14 +18,7 @@ call .\env.bat
 del env.bat\r
 \r
 set GOPATH=c:\nonexist-gopath\r
-\r
-if x%1==x--no-rebuild goto norebuild\r
-..\bin\go tool dist test --rebuild\r
-if errorlevel 1 goto fail\r
-goto :eof\r
-\r
-:norebuild\r
-..\bin\go tool dist test\r
+..\bin\go tool dist test --rebuild %*\r
 if errorlevel 1 goto fail\r
 goto :eof\r
 \r