aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-09 13:43:19 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-09 14:18:55 -0700
commit19c8c4a9b70a5c896d2c88250d7f209970fdf8d0 (patch)
tree94f3d719a16c529985b8ff287efe9c131cae9b2a /t
parentf23b1d06e5a7a162a7cfc5281b10580e7e3d23d6 (diff)
downloadgit-19c8c4a9b70a5c896d2c88250d7f209970fdf8d0.tar.gz
git-19c8c4a9b70a5c896d2c88250d7f209970fdf8d0.tar.xz
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
This was only necessary because do_tests helper the script defines took its parameters in a wrong order. Just pass an empty string (or not passing the optional EXPENSIVE prerequisite) when running the test with a light-weight set of parameters and have the shell do the right thing when parsing test_expect_success helper. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t3302-notes-index-expensive.sh10
1 files changed, 4 insertions, 6 deletions
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 7712cf399..8d44e0435 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -7,7 +7,6 @@ test_description='Test commit notes index (expensive!)'
. ./test-lib.sh
-test_set_prereq NOT_EXPENSIVE
test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
create_repo () {
@@ -103,8 +102,7 @@ time_notes () {
}
do_tests () {
- pr=$1
- count=$2
+ count=$1 pr=${2-}
test_expect_success $pr "setup $count" '
mkdir "$count" &&
@@ -121,7 +119,7 @@ do_tests () {
)
'
- test_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' '
+ test_expect_success "USR_BIN_TIME${pr:+,$pr}" 'notes timing with /usr/bin/time' '
(
cd "$count" &&
time_notes 100
@@ -129,10 +127,10 @@ do_tests () {
'
}
-do_tests NOT_EXPENSIVE 10
+do_tests 10
for count in 100 1000 10000
do
- do_tests EXPENSIVE $count
+ do_tests "$count" EXPENSIVE
done
test_done