[2/2] t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool
diff mbox series

Message ID 20191122131437.25849-3-szeder.dev@gmail.com
State New
Headers show
Series
  • tests: catch non-bool GIT_TEST_* values
Related show

Commit Message

SZEDER Gábor Nov. 22, 2019, 1:14 p.m. UTC
The GIT_TEST_CLONE_2GB environment variable is only ever checked with
'test -z' in 't5608-clone-2gb.sh', so any non-empty value is
interpreted as "yes, run these expensive tests", even
'GIT_TEST_CLONE_2GB=NoThanks'.

Similar GIT_TEST_* environment variables have already been turned into
bools in 3b072c577b (tests: replace test_tristate with "git
env--helper", 2019-06-21), so let's turn GIT_TEST_CLONE_2GB into a
bool as well, to follow suit.

Our CI builds set GIT_TEST_CLONE_2GB=YesPlease, so adjust them
accordingly, thus removing the last 'YesPlease' from our CI scripts.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
---
 ci/lib.sh            | 2 +-
 t/t5608-clone-2gb.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Jeff King Nov. 25, 2019, 1:53 p.m. UTC | #1
On Fri, Nov 22, 2019 at 02:14:37PM +0100, SZEDER Gábor wrote:

> The GIT_TEST_CLONE_2GB environment variable is only ever checked with
> 'test -z' in 't5608-clone-2gb.sh', so any non-empty value is
> interpreted as "yes, run these expensive tests", even
> 'GIT_TEST_CLONE_2GB=NoThanks'.
> 
> Similar GIT_TEST_* environment variables have already been turned into
> bools in 3b072c577b (tests: replace test_tristate with "git
> env--helper", 2019-06-21), so let's turn GIT_TEST_CLONE_2GB into a
> bool as well, to follow suit.
> 
> Our CI builds set GIT_TEST_CLONE_2GB=YesPlease, so adjust them
> accordingly, thus removing the last 'YesPlease' from our CI scripts.

This might break the setup of some developer or tester who put a similar
value into their config.mak. But I think that's worth it to reduce
confusion in the long run, especially since they will get a very clear
error message due to your first patch.

-Peff

Patch
diff mbox series

diff --git a/ci/lib.sh b/ci/lib.sh
index 29dc740d40..2540bb6110 100755
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -151,7 +151,7 @@  fi
 
 export DEVELOPER=1
 export DEFAULT_TEST_TARGET=prove
-export GIT_TEST_CLONE_2GB=YesPlease
+export GIT_TEST_CLONE_2GB=true
 
 case "$jobname" in
 linux-clang|linux-gcc)
diff --git a/t/t5608-clone-2gb.sh b/t/t5608-clone-2gb.sh
index 2c6bc07344..eee0842888 100755
--- a/t/t5608-clone-2gb.sh
+++ b/t/t5608-clone-2gb.sh
@@ -3,7 +3,7 @@ 
 test_description='Test cloning a repository larger than 2 gigabyte'
 . ./test-lib.sh
 
-if test -z "$GIT_TEST_CLONE_2GB"
+if ! test_bool_env GIT_TEST_CLONE_2GB false
 then
 	say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'
 else