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>
Junio C Hamano committed
Jun 9, 2014 at 13:43 UTC
19c8c4a9b70a5c896d2c88250d7f209970fdf8d0
1 file changed
+4
-6
t/t3302-notes-index-expensive.sh
+4
-6
@@ -7,7 +7,6 @@ test_description='Test commit notes index (expensive!)'
7
8
. ./test-lib.sh
9
10
-test_set_prereq NOT_EXPENSIVE
10
test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE
11
12
create_repo () {
@@ -103,8 +102,7 @@ time_notes () {
102
}
103
104
do_tests () {
106
- pr=$1
107
- count=$2
105
+ count=$1 pr=${2-}
106
107
test_expect_success $pr "setup $count" '
108
mkdir "$count" &&
@@ -121,7 +119,7 @@ do_tests () {
119
)
120
'
121
124
- test_expect_success USR_BIN_TIME,$pr 'notes timing with /usr/bin/time' '
122
+ test_expect_success "USR_BIN_TIME${pr:+,$pr}" 'notes timing with /usr/bin/time' '
123
(
124
cd "$count" &&
125
time_notes 100
@@ -129,10 +127,10 @@ do_tests () {
127
'
128
}
129
132
-do_tests NOT_EXPENSIVE 10
130
+do_tests 10
131
for count in 100 1000 10000
132
do
135
- do_tests EXPENSIVE $count
133
+ do_tests "$count" EXPENSIVE
134
done
135
136
test_done