From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 5/7] t3302: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite
Date: Mon, 9 Jun 2014 16:22:53 -0700 [thread overview]
Message-ID: <1402356175-7249-6-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1402356175-7249-1-git-send-email-gitster@pobox.com>
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>
---
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
next prev parent reply other threads:[~2014-06-09 23:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-09 23:22 [PATCH 0/7] A few minor test-prereq updates Junio C Hamano
2014-06-09 23:22 ` [PATCH 1/7] test: turn EXPENSIVE into a lazy prerequisite Junio C Hamano
2014-06-09 23:22 ` [PATCH 2/7] test: turn USR_BIN_TIME " Junio C Hamano
2014-06-13 7:45 ` Jeff King
2014-06-09 23:22 ` [PATCH 3/7] t3302: coding style updates Junio C Hamano
2014-06-09 23:22 ` [PATCH 4/7] t3302: do not chdir around in the primary test process Junio C Hamano
2014-06-09 23:22 ` Junio C Hamano [this message]
2014-06-09 23:22 ` [PATCH 6/7] t3419: drop unnecessary NOT_EXPENSIVE pseudo-prerequisite Junio C Hamano
2014-06-09 23:22 ` [PATCH 7/7] tests: drop GIT_*_TIMING_TESTS environment variable support Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1402356175-7249-6-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).