diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-20 13:21:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-20 13:21:26 -0700 |
| commit | bf80b8a6d8da756324e5d2d113f405d44aaac379 (patch) | |
| tree | e17d58d5eb43868c07b9817dd348e6801df2a520 /t/test-lib.sh | |
| parent | a668853c6715b481bff347d7a08f5d885fc95f86 (diff) | |
| parent | b687cd6aba394bba34ad9fb70aa33cd5cfcebc6c (diff) | |
| download | git-bf80b8a6d8da756324e5d2d113f405d44aaac379.tar.gz git-bf80b8a6d8da756324e5d2d113f405d44aaac379.tar.xz | |
Merge branch 'jc/test-lazy-prereq' (early part)
* 'jc/test-lazy-prereq' (early part):
t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
t3302: do not chdir around in the primary test process
t3302: coding style updates
test: turn USR_BIN_TIME into a lazy prerequisite
test: turn EXPENSIVE into a lazy prerequisite
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 81394c8c7..a4795373a 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -976,6 +976,14 @@ test_lazy_prereq AUTOIDENT ' git var GIT_AUTHOR_IDENT ' +test_lazy_prereq EXPENSIVE ' + test -n "$GIT_TEST_LONG" +' + +test_lazy_prereq USR_BIN_TIME ' + test -x /usr/bin/time +' + # When the tests are run as root, permission tests will report that # things are writable when they shouldn't be. test -w / || test_set_prereq SANITY |