From e1ecd9e3c8f800e3eab908df3e9fc4e166fca394 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 9 Jun 2014 13:54:25 -0700 Subject: 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 --- t/t3302-notes-index-expensive.sh | 1 - t/t3419-rebase-patch-id.sh | 1 - t/test-lib.sh | 4 ++++ 3 files changed, 4 insertions(+), 2 deletions(-) (limited to 't') diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh index e35d7811ac..dc706abe5c 100755 --- 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 -x /usr/bin/time && test_set_prereq USR_BIN_TIME create_repo () { number_of_commits=$1 diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh index e70ac10a0c..08e30b30f4 100755 --- 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 -x /usr/bin/time && test_set_prereq USR_BIN_TIME count() { diff --git a/t/test-lib.sh b/t/test-lib.sh index d70d05e1cb..884c57c30b 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -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 -- cgit v1.2.3