From 182bdbb1e1d62fe53f8386e7b02c7738898d373b Mon Sep 17 00:00:00 2001 From: Josh Bleecher Snyder Date: Mon, 16 Jul 2018 11:03:45 -0700 Subject: [PATCH] [release-branch.go1.4] all.bash: skip tests by default The 1.4 tests aren't necessarily supposed to pass. Disable them by default, to avoid the sort of unpleasant experience described in #25816. Change-Id: I763b8e52c8d16f4d9be14ad853df456652e51430 Reviewed-on: https://go-review.googlesource.com/124077 Reviewed-by: Brad Fitzpatrick --- src/all.bash | 5 +++++ src/all.bat | 5 +++++ src/all.rc | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/all.bash b/src/all.bash index 5d994d3d0d..196c8eb21d 100755 --- a/src/all.bash +++ b/src/all.bash @@ -10,6 +10,11 @@ if [ ! -f make.bash ]; then fi OLDPATH="$PATH" . ./make.bash "$@" --no-banner +if [ "$GO14TESTS" != "1" ]; then + echo "Build complete; skipping tests." + echo "To force tests, set GO14TESTS=1 and re-run, but expect some failures." + exit +fi bash run.bash --no-rebuild PATH="$OLDPATH" $GOTOOLDIR/dist banner # print build info diff --git a/src/all.bat b/src/all.bat index 0647a715ba..16898db769 100644 --- a/src/all.bat +++ b/src/all.bat @@ -14,6 +14,11 @@ goto end set OLDPATH=%PATH% call make.bat --no-banner --no-local if %GOBUILDFAIL%==1 goto end +if x%GO14TESTS%==x1 goto runtests +echo Build complete; skipping tests. +echo To force tests, set GO14TESTS=1 and re-run, but expect some failures. +goto end +:runtests call run.bat --no-rebuild --no-local if %GOBUILDFAIL%==1 goto end :: we must restore %PATH% before running "dist banner" so that the latter diff --git a/src/all.rc b/src/all.rc index 14e2f5565a..30237226b6 100755 --- a/src/all.rc +++ b/src/all.rc @@ -11,6 +11,11 @@ if(! test -f make.rc){ } . ./make.rc --no-banner +if(~ $GO14TESTS ''){ + echo 'Build complete; skipping tests.' + echo 'To force tests, set GO14TESTS = 1 and re-run, but expect some failures.' + exit +} bind -b $GOROOT/bin /bin ./run.rc --no-rebuild $GOTOOLDIR/dist banner # print build info