Skip to content

Commit

Permalink
test: turn USR_BIN_TIME into a lazy prerequisite
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jun 9, 2014
1 parent 6219bb2 commit e1ecd9e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion t/t3302-notes-index-expensive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ test_description='Test commit notes index (expensive!)'

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

create_repo () {
number_of_commits=$1
Expand Down
1 change: 0 additions & 1 deletion t/t3419-rebase-patch-id.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ test_description='git rebase - test patch id computation'

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

count()
{
Expand Down
4 changes: 4 additions & 0 deletions t/test-lib.sh
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,10 @@ 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
Expand Down

0 comments on commit e1ecd9e

Please sign in to comment.