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>

diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index e35d7811acc60415e38e58866b5488938d0372a4..dc706abe5c616a6f212a0cec4a74afcce0e11c9b 100755 (executable)
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -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_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
 
 create_repo () {
        number_of_commits=$1

diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index e70ac10a0cdbcd112b7b3c3e74aa89b09d46d1df..08e30b30f40e767c19f3b074a19840f07944d063 100755 (executable)
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -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_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()
 {
 
 count()
 {

diff --git a/t/test-lib.sh b/t/test-lib.sh
index d70d05e1cb60951df221069d75f460a46b759096..884c57c30bfa60ac55cce020828b025b75a8a26c 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -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
 # things are writable when they shouldn't be.
 test -w / || test_set_prereq SANITY
 # 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