undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2014-06-09 13:43:19 -07:00
parent f23b1d06e5
commit 19c8c4a9b7
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
t/t3302-notes-index-expensive.sh
View File

@ -7,7 +7,6 @@ test_description='Test commit notes index (expensive!)'
. ./test-lib.sh . ./test-lib.sh
test_set_prereq NOT_EXPENSIVE
test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
create_repo () { create_repo () {
@ -103,8 +102,7 @@ time_notes () {
} }
do_tests () { do_tests () {
pr=$1 count=$1 pr=${2-}
count=$2
test_expect_success $pr "setup $count" ' test_expect_success $pr "setup $count" '
mkdir "$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" && cd "$count" &&
time_notes 100 time_notes 100
@ -129,10 +127,10 @@ do_tests () {
' '
} }
do_tests NOT_EXPENSIVE 10 do_tests 10
for count in 100 1000 10000 for count in 100 1000 10000
do do
do_tests EXPENSIVE $count do_tests "$count" EXPENSIVE
done done
test_done test_done