From: Thomas Rast <trast@inf.ethz.ch>
To: Junio C Hamano <gitster@pobox.com>
Cc: <git@vger.kernel.org>, Fredrik Gustafsson <iveqy@iveqy.com>,
Jeff King <peff@peff.net>
Subject: [PATCH v4 3/8] test-lib: rearrange start/end of test_expect_* and test_skip
Date: Sun, 23 Jun 2013 20:12:54 +0200 [thread overview]
Message-ID: <6768d2c43cc7f34b70a493f5ac5fee1571b60f78.1372010917.git.trast@inf.ethz.ch> (raw)
In-Reply-To: <cover.1372010917.git.trast@inf.ethz.ch>
This moves
* the early setup part from test_skip to a new function test_start_
* the final common parts of test_expect_* to a new function
test_finish_
to make the next commit more obvious.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
---
t/test-lib-functions.sh | 6 ++++--
t/test-lib.sh | 9 ++++++++-
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 8828ff7..a7e9aac 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -343,6 +343,7 @@ test_declared_prereq () {
}
test_expect_failure () {
+ test_start_
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-failure"
@@ -357,10 +358,11 @@ test_expect_failure () {
test_known_broken_failure_ "$1"
fi
fi
- echo >&3 ""
+ test_finish_
}
test_expect_success () {
+ test_start_
test "$#" = 3 && { test_prereq=$1; shift; } || test_prereq=
test "$#" = 2 ||
error "bug in the test script: not 2 or 3 parameters to test-expect-success"
@@ -375,7 +377,7 @@ test_expect_success () {
test_failure_ "$@"
fi
fi
- echo >&3 ""
+ test_finish_
}
# test_external runs external test scripts that provide continuous
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 4fa141a..e99b0ea 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -369,8 +369,15 @@ test_run_ () {
return "$eval_ret"
}
-test_skip () {
+test_start_ () {
test_count=$(($test_count+1))
+}
+
+test_finish_ () {
+ echo >&3 ""
+}
+
+test_skip () {
to_skip=
if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
then
--
1.8.3.1.727.gcbe3af3
next prev parent reply other threads:[~2013-06-23 18:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-23 18:12 [PATCH v4 0/8] --valgrind improvements Thomas Rast
2013-06-23 18:12 ` [PATCH v4 1/8] test-lib: enable MALLOC_* for the actual tests Thomas Rast
2013-06-23 18:12 ` [PATCH v4 2/8] test-lib: refactor $GIT_SKIP_TESTS matching Thomas Rast
2013-06-23 18:12 ` Thomas Rast [this message]
2013-06-23 18:12 ` [PATCH v4 4/8] test-lib: self-test that --verbose works Thomas Rast
2013-06-23 18:12 ` [PATCH v4 5/8] test-lib: verbose mode for only tests matching a pattern Thomas Rast
2013-06-23 18:12 ` [PATCH v4 6/8] test-lib: valgrind " Thomas Rast
2013-06-23 18:12 ` [PATCH v4 7/8] test-lib: allow prefixing a custom string before "ok N" etc Thomas Rast
2013-06-23 18:12 ` [PATCH v4 8/8] test-lib: support running tests under valgrind in parallel Thomas Rast
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6768d2c43cc7f34b70a493f5ac5fee1571b60f78.1372010917.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=iveqy@iveqy.com \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).