From: Michael J Gruber <git@drmicha.warpmail.net>
To: git@vger.kernel.org
Cc: Joachim Schmitz <jojo@schmitz-digital.de>,
Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 4/4] t3302,t3419: use the TIME_COMMAND prereq
Date: Tue, 16 Oct 2012 13:39:47 +0200 [thread overview]
Message-ID: <71d3a0f9ab2bfd73fb2abfb4a0bc9fa7be6cd70b.1350387132.git.git@drmicha.warpmail.net> (raw)
In-Reply-To: <k5gq60$q8c$1@ger.gmane.org>
In-Reply-To: <cover.1350387132.git.git@drmicha.warpmail.net>
Use the TIME_COMMAND prereq in both tests so that time from several
paths can be used.
Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
t/t3302-notes-index-expensive.sh | 5 ++---
t/t3419-rebase-patch-id.sh | 7 +++----
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index e35d781..3d9f37e 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
@@ -96,7 +95,7 @@ time_notes () {
for mode in no-notes notes
do
echo $mode
- /usr/bin/time "$SHELL_PATH" ../time_notes $mode $1
+ "$TIME_COMMAND_PATH" "$SHELL_PATH" ../time_notes $mode $1
done
}
@@ -113,7 +112,7 @@ do_tests () {
test_expect_success $pr 'notes work' "test_notes $count"
- test_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' "time_notes 100"
+ test_expect_success TIME_COMMAND,$pr 'notes timing with a time command' "time_notes 100"
test_expect_success $pr 'teardown / cd ..' 'cd ..'
}
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 52af547..c7d90a6 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()
{
@@ -35,7 +34,7 @@ scramble()
run()
{
echo \$ "$@"
- /usr/bin/time "$@" >/dev/null
+ "$TIME_COMMAND_PATH" "$@" >/dev/null
}
test_expect_success 'setup' '
@@ -69,7 +68,7 @@ do_tests()
git cherry-pick master >/dev/null 2>&1
"
- test_have_prereq USR_BIN_TIME && test_debug "
+ test_have_prereq TIME_COMMAND && test_debug "
run git diff master^\!
"
@@ -77,7 +76,7 @@ do_tests()
echo 'file binary' >.gitattributes
"
- test_have_prereq USR_BIN_TIME && test_debug "
+ test_have_prereq TIME_COMMAND && test_debug "
run git format-patch --stdout master &&
run git format-patch --stdout --ignore-if-in-upstream master
"
--
1.8.0.rc2.304.g9f3ac5c
prev parent reply other threads:[~2012-10-16 11:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 10:56 t3302-notes-index-expensive.sh and t3419-rebase-patch-id.sh need time in /usr/bin Joachim Schmitz
2012-10-16 11:39 ` [PATCH 0/4] Allow different time commands Michael J Gruber
2012-10-16 11:39 ` [PATCH 1/4] t3419-rebase-patch-id: heed USR_BIN_TIME prereq Michael J Gruber
2012-10-16 16:32 ` Junio C Hamano
2012-10-16 11:39 ` [PATCH 2/4] test-lib: allow variable export from lazy prereq tests Michael J Gruber
2012-10-16 16:16 ` Junio C Hamano
2012-10-16 11:39 ` [RFC/PATCH 3/4] test-lib: provide lazy TIME_COMMAND prereq Michael J Gruber
2012-10-16 14:13 ` Joachim Schmitz
2012-10-16 15:06 ` Michael J Gruber
2012-10-16 15:11 ` Joachim Schmitz
2012-10-16 15:07 ` [RFC/PATCH 3/4v2] " Michael J Gruber
2012-10-16 16:28 ` Andreas Schwab
2012-10-16 18:28 ` Stefano Lattarini
2012-10-16 19:21 ` Johannes Sixt
2012-10-16 19:34 ` Junio C Hamano
2012-10-16 16:41 ` [RFC/PATCH 3/4] " Junio C Hamano
2012-10-16 11:39 ` Michael J Gruber [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=71d3a0f9ab2bfd73fb2abfb4a0bc9fa7be6cd70b.1350387132.git.git@drmicha.warpmail.net \
--to=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jojo@schmitz-digital.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).