diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-03-28 21:16:09 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-28 14:08:36 -0700 |
| commit | 730477f199489d61b960633501c390e03f04cba9 (patch) | |
| tree | c61efd9f96aa98c31f3c9e3aa7059866fb9f29e9 /t | |
| parent | cea13a8d685802389fad5b1ffce3af38175a8a01 (diff) | |
| download | git-730477f199489d61b960633501c390e03f04cba9.tar.gz git-730477f199489d61b960633501c390e03f04cba9.tar.xz | |
tests: fix overeager scrubbing of environment variables
In commit 95a1d12e9b9f ("tests: scrub environment of GIT_* variables") all
environment variables starting with "GIT_" were unset for the tests using
a perl script rather than unsetting them one by one. Only three exceptions
were made to make them work as before: "GIT_TRACE*", "GIT_DEBUG*" and
"GIT_USE_LOOKUP".
Unfortunately some environment variables used by the test framework itself
were not added to the exceptions and thus stopped working when given
before the make command instead of after it. Those are:
- GIT_NOTES_TIMING_TESTS
- GIT_PATCHID_TIMING_TESTS
- GIT_PROVE_OPTS
- GIT_REMOTE_SVN_TEST_BIG_FILES
- GIT_SKIP_TESTS
- GIT_TEST*
- GIT_VALGRIND_OPTIONS
I noticed that when skipping a test the way I was used to suddenly failed:
GIT_SKIP_TESTS='t1234' GIT_TEST_OPTS='--root=/dev/shm' make -j10 test
This should work according to t/README, but didn't anymore, so let's fix
that by adding them to the exception list. And to avoid having a long
regexp put the exceptions in a separate variable using nicer formatting.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
Thanks-to: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 7cc9a52cb..7a56f1110 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -46,7 +46,16 @@ unset VISUAL unset EMAIL unset $(perl -e ' my @env = keys %ENV; - my @vars = grep(/^GIT_/ && !/^GIT_(TRACE|DEBUG|USE_LOOKUP)/, @env); + my $ok = join("|", qw( + TRACE + DEBUG + USE_LOOKUP + TEST + .*_TEST + PROVE + VALGRIND + )); + my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env); print join("\n", @vars); ') GIT_AUTHOR_EMAIL=author@example.com |