diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-06-09 12:23:30 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-09 14:18:55 -0700 |
| commit | 6219bb22ba213ff75ca9cb8aa0d4debd28c34f21 (patch) | |
| tree | 51d78d1717ab03899d49a62d0829c942b7d9118f | |
| parent | Git 1.8.5.5 (diff) | |
| download | tgif-6219bb22ba213ff75ca9cb8aa0d4debd28c34f21.tar.xz | |
test: turn EXPENSIVE into a lazy prerequisite
Two test scripts (t0021 and t5551) had copy & paste code to set
EXPENSIVE prerequisite. Use the test_lazy_prereq helper to define
them in the common t/test-lib.sh.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t0021-conversion.sh | 2 | ||||
| -rwxr-xr-x | t/t5551-http-fetch.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index b92e6cb046..f890c54d13 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -190,8 +190,6 @@ test_expect_success 'required filter clean failure' ' test_must_fail git add test.fc ' -test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE - test_expect_success EXPENSIVE 'filter large file' ' git config filter.largefile.smudge cat && git config filter.largefile.clean cat && diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index afb439e09c..d69739337b 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -214,8 +214,6 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set test_cmp expect_cookies.txt cookies_tail.txt ' -test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE - test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' ( cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" && diff --git a/t/test-lib.sh b/t/test-lib.sh index b25249ec4c..d70d05e1cb 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -855,6 +855,10 @@ test_lazy_prereq AUTOIDENT ' git var GIT_AUTHOR_IDENT ' +test_lazy_prereq EXPENSIVE ' + test -n "$GIT_TEST_LONG" +' + # 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 |