Use the TIME_COMMAND prereq in both tests so that time from several
paths can be used.
Signed-off-by: Michael J Gruber <git@xxxxxxxxxxxxxxxxxxxx>
---
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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html