t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite

gitster · gitster · commit 19c8c4a9b70a · 2014-06-09T14:18:55.000-07:00
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 &lt;gitster@pobox.com&gt;
diff --git 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,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

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@ test_description='Test commit notes index (expensive!)'`
`7`	`7`
`8`	`8`	`. ./test-lib.sh`
`9`	`9`
`10`		`-test_set_prereq NOT_EXPENSIVE`
`11`	`10`	`test -n "$GIT_NOTES_TIMING_TESTS" && test_set_prereq EXPENSIVE`
`12`	`11`
`13`	`12`	`create_repo () {`
`@@ -103,8 +102,7 @@ time_notes () {`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`do_tests () {`
`106`		`- pr=$1`
`107`		`- count=$2`
	`105`	`+ count=$1 pr=${2-}`
`108`	`106`
`109`	`107`	`test_expect_success $pr "setup $count" '`
`110`	`108`	`mkdir "$count" &&`
`@@ -121,18 +119,18 @@ do_tests () {`
`121`	`119`	`)`
`122`	`120`	`'`
`123`	`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' '`
`125`	`123`	`(`
`126`	`124`	`cd "$count" &&`
`127`	`125`	`time_notes 100`
`128`	`126`	`)`
`129`	`127`	`'`
`130`	`128`	`}`
`131`	`129`
`132`		`-do_tests NOT_EXPENSIVE 10`
	`130`	`+do_tests 10`
`133`	`131`	`for count in 100 1000 10000`
`134`	`132`	`do`
`135`		`- do_tests EXPENSIVE $count`
	`133`	`+ do_tests "$count" EXPENSIVE`
`136`	`134`	`done`
`137`	`135`
`138`	`136`	`test_done`