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 2/8] test-lib: refactor $GIT_SKIP_TESTS matching
Date: Sun, 23 Jun 2013 20:12:53 +0200 [thread overview]
Message-ID: <271eaadb01fd16324eea440e56c404266fcce2ff.1372010917.git.trast@inf.ethz.ch> (raw)
In-Reply-To: <cover.1372010917.git.trast@inf.ethz.ch>
It's already used twice, and we will have more of the same kind of
matching in a minute.
Helped-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
---
t/test-lib.sh | 41 ++++++++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 17 deletions(-)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 35da859..4fa141a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -328,6 +328,20 @@ test_debug () {
test "$debug" = "" || eval "$1"
}
+match_pattern_list () {
+ arg="$1"
+ shift
+ test -z "$*" && return 1
+ for pattern_
+ do
+ case "$arg" in
+ $pattern_)
+ return 0
+ esac
+ done
+ return 1
+}
+
test_eval_ () {
# This is a separate function because some tests use
# "return" to end a test_expect_success block early.
@@ -358,14 +372,10 @@ test_run_ () {
test_skip () {
test_count=$(($test_count+1))
to_skip=
- for skp in $GIT_SKIP_TESTS
- do
- case $this_test.$test_count in
- $skp)
- to_skip=t
- break
- esac
- done
+ if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
+ then
+ to_skip=t
+ fi
if test -z "$to_skip" && test -n "$test_prereq" &&
! test_have_prereq "$test_prereq"
then
@@ -630,15 +640,12 @@ cd -P "$TRASH_DIRECTORY" || exit 1
this_test=${0##*/}
this_test=${this_test%%-*}
-for skp in $GIT_SKIP_TESTS
-do
- case "$this_test" in
- $skp)
- say_color info >&3 "skipping test $this_test altogether"
- skip_all="skip all tests in $this_test"
- test_done
- esac
-done
+if match_pattern_list "$this_test" $GIT_SKIP_TESTS
+then
+ say_color info >&3 "skipping test $this_test altogether"
+ skip_all="skip all tests in $this_test"
+ test_done
+fi
# Provide an implementation of the 'yes' utility
yes () {
--
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 ` Thomas Rast [this message]
2013-06-23 18:12 ` [PATCH v4 3/8] test-lib: rearrange start/end of test_expect_* and test_skip Thomas Rast
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=271eaadb01fd16324eea440e56c404266fcce2ff.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).