kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

test: turn USR_BIN_TIME into a lazy prerequisite 

Two test scripts (t3302 and t3419) had copy & paste code to set
USR_BIN_TIME 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>
maint
Junio C Hamano 2014-06-09 13:54:25 -07:00
parent 6219bb22ba
commit e1ecd9e3c8
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
t/t3302-notes-index-expensive.sh
View File

@ -9,7 +9,6 @@ test_description='Test commit notes index (expensive!)'


test_set_prereq NOT_EXPENSIVE test_set_prereq NOT_EXPENSIVE
test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
test -x /usr/bin/time && test_set_prereq USR_BIN_TIME


create_repo () { create_repo () {
number_of_commits=$1 number_of_commits=$1

1
t/t3419-rebase-patch-id.sh
View File

@ -6,7 +6,6 @@ test_description='git rebase - test patch id computation'


test_set_prereq NOT_EXPENSIVE test_set_prereq NOT_EXPENSIVE
test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE
test -x /usr/bin/time && test_set_prereq USR_BIN_TIME


count() count()
{ {

4
t/test-lib.sh
View File

@ -859,6 +859,10 @@ test_lazy_prereq EXPENSIVE '
test -n "$GIT_TEST_LONG" 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 # When the tests are run as root, permission tests will report that
# things are writable when they shouldn't be. # things are writable when they shouldn't be.
test -w / || test_set_prereq SANITY test -w / || test_set_prereq SANITY