git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ilya Bobyr <ilya.bobyr@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
	Thomas Rast <tr@thomasrast.ch>, Ilya Bobyr <ilya.bobyr@gmail.com>
Subject: [PATCH 1/2] test-lib: tests skipped by GIT_SKIP_TESTS say so
Date: Mon,  3 Mar 2014 02:24:57 -0800	[thread overview]
Message-ID: <1393842298-5944-1-git-send-email-ilya.bobyr@gmail.com> (raw)

We used to show "(missing )" next to tests skipped because they are
specified in GIT_SKIP_TESTS.  Use "(matched by GIT_SKIP_TESTS)" instead.
---
 t/test-lib.sh |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 1531c24..89a405b 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -446,25 +446,28 @@ test_finish_ () {
 
 test_skip () {
 	to_skip=
+	skipped_reason=
 	if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
 	then
 		to_skip=t
+		skipped_reason="matched GIT_SKIP_TESTS"
 	fi
 	if test -z "$to_skip" && test -n "$test_prereq" &&
 	   ! test_have_prereq "$test_prereq"
 	then
 		to_skip=t
-	fi
-	case "$to_skip" in
-	t)
+
 		of_prereq=
 		if test "$missing_prereq" != "$test_prereq"
 		then
 			of_prereq=" of $test_prereq"
 		fi
-
+		skipped_reason="missing $missing_prereq${of_prereq}"
+	fi
+	case "$to_skip" in
+	t)
 		say_color skip >&3 "skipping test: $@"
-		say_color skip "ok $test_count # skip $1 (missing $missing_prereq${of_prereq})"
+		say_color skip "ok $test_count # skip $1 ($skipped_reason)"
 		: true
 		;;
 	*)
-- 
1.7.9

             reply	other threads:[~2014-03-03 10:25 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-03 10:24 Ilya Bobyr [this message]
2014-03-03 10:24 ` [PATCH 2/2] test-lib: GIT_TEST_ONLY to run only specific tests Ilya Bobyr
2014-03-03 15:56   ` Philip Oakley
2014-03-03 23:03   ` Eric Sunshine
2014-03-03 23:16     ` Ilya Bobyr
2014-03-03 23:26     ` Junio C Hamano
2014-03-03 23:48       ` Ilya Bobyr
2014-03-04  0:08         ` Junio C Hamano
2014-03-04  7:06           ` Ilya Bobyr
2014-03-04  8:29             ` Junio C Hamano
2014-03-04  9:18               ` Ilya Bobyr
2014-03-04 19:01                 ` Junio C Hamano
2014-03-03 15:11 ` [PATCH 1/2] test-lib: tests skipped by GIT_SKIP_TESTS say so Philip Oakley
2014-03-03 23:08   ` Ilya Bobyr
2014-03-03 22:59 ` Eric Sunshine
2014-03-03 23:12   ` Ilya Bobyr
2014-03-03 23:13   ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2014-03-03 23:18 Eric Sunshine
2014-03-03 23:39 ` Junio C Hamano
2014-03-03 23:50 ` Ilya Bobyr

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=1393842298-5944-1-git-send-email-ilya.bobyr@gmail.com \
    --to=ilya.bobyr@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    --cc=tr@thomasrast.ch \
    /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).