summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:22 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-29 22:17:23 -0700
commit0ba92ef3386a360442e0403b6655384c2d62557f (patch)
treed1242ed1c5531dcdc53002fba703a413d27eb492
parentMerge branch 'sb/merge-recursive-copy-paste-fix' (diff)
parenttests: drop GIT_*_TIMING_TESTS environment variable support (diff)
downloadtgif-0ba92ef3386a360442e0403b6655384c2d62557f.tar.xz
Merge branch 'jc/test-lazy-prereq'
Test-script clean-up. * jc/test-lazy-prereq: tests: drop GIT_*_TIMING_TESTS environment variable support
-rwxr-xr-xt/t3302-notes-index-expensive.sh2
-rwxr-xr-xt/t3419-rebase-patch-id.sh2
2 files changed, 0 insertions, 4 deletions
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 8d44e04354..7217c5e222 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -7,8 +7,6 @@ test_description='Test commit notes index (expensive!)'
. ./test-lib.sh
-test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
-
create_repo () {
number_of_commits=$1
nr=0
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 9292b499f3..217dd79b2e 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -4,8 +4,6 @@ test_description='git rebase - test patch id computation'
. ./test-lib.sh
-test -n "$GIT_PATCHID_TIMING_TESTS" && test_set_prereq EXPENSIVE
-
count () {
i=0
while test $i -lt $1