From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 2/7] test: turn USR_BIN_TIME into a lazy prerequisite
Date: Mon, 9 Jun 2014 16:22:50 -0700 [thread overview]
Message-ID: <1402356175-7249-3-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1402356175-7249-1-git-send-email-gitster@pobox.com>
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>
---
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(-)
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index e35d781..dc706ab 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 e70ac10..08e30b3 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 d70d05e..884c57c 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
--
2.0.0-435-g307a092
next prev parent reply other threads:[~2014-06-09 23:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 23:22 [PATCH 0/7] A few minor test-prereq updates Junio C Hamano
2014-06-09 23:22 ` [PATCH 1/7] test: turn EXPENSIVE into a lazy prerequisite Junio C Hamano
2014-06-09 23:22 ` Junio C Hamano [this message]
2014-06-13 7:45 ` [PATCH 2/7] test: turn USR_BIN_TIME " Jeff King
2014-06-09 23:22 ` [PATCH 3/7] t3302: coding style updates Junio C Hamano
2014-06-09 23:22 ` [PATCH 4/7] t3302: do not chdir around in the primary test process Junio C Hamano
2014-06-09 23:22 ` [PATCH 5/7] t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite Junio C Hamano
2014-06-09 23:22 ` [PATCH 6/7] t3419: " Junio C Hamano
2014-06-09 23:22 ` [PATCH 7/7] tests: drop GIT_*_TIMING_TESTS environment variable support Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402356175-7249-3-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).