Skip to content

Commit

Permalink
t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jun 9, 2014
1 parent f23b1d0 commit 19c8c4a
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions t/t3302-notes-index-expensive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 () {
Expand Down Expand Up @@ -103,8 +102,7 @@ time_notes () {
}

do_tests () {
pr=$1
count=$2
count=$1 pr=${2-}

test_expect_success $pr "setup $count" '
mkdir "$count" &&
Expand All @@ -121,18 +119,18 @@ 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
)
'
}

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

0 comments on commit 19c8c4a

Please sign in to comment.