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@xxxxxxxxx>
---
t/t3302-notes-index-expensive.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 7712cf3..8d44e04 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
--
2.0.0-435-g307a092
--
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