From: Junio C Hamano Date: Mon, 9 Jun 2014 19:23:30 +0000 (-0700) Subject: test: turn EXPENSIVE into a lazy prerequisite X-Git-Tag: v2.1.0-rc0~92^2~5 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6219bb22ba213ff75ca9cb8aa0d4debd28c34f21;p=git-core%2Fgit.git 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 --- diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index b92e6cb04..f890c54d1 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 afb439e09..d69739337 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 b25249ec4..d70d05e1c 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