git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Ramsay Jones <ramsay@ramsayjones.plus.com>
Cc: Stefan Beller <sbeller@google.com>,
	GIT Mailing-list <git@vger.kernel.org>
Subject: Re: t5545: reduced test coverage
Date: Wed, 17 May 2017 13:23:45 +0900	[thread overview]
Message-ID: <xmqqinl0xga6.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqmvacxhk0.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 17 May 2017 12:56:15 +0900")

Junio C Hamano <gitster@pobox.com> writes:

> Junio C Hamano <gitster@pobox.com> writes:
>
>> It appears to me that only a few tests in the entire script wants to
>> work with HTTP server, so perhaps moving them to the end, together
>> with the inclusion of lib-httpd and start_httpd that 438fc684 ("push
>> options: pass push options to the transport helper", 2017-02-08)
>> introduced, may be sufficient?
>
> Probably not, as lib-httpd, when it gives up, does the
> "skip_all=message; test_done" thing, which makes test_done
> to trigger this:
>
> 	# Maybe print SKIP message
> 	if test -n "$skip_all" && test $test_count -gt 0
> 	then
> 		error "Can't use skip_all after running some tests"
> 	fi
>
> So a bit more work is needed, than just moving things around, I am
> afraid...

And now I am visiting bf4b7219 ("test-lib.sh: Add check for invalid
use of 'skip_all' facility", 2012-09-01), which is yours ;-)

I am wondering what the fallouts would be if we did the following to
test-lib.  We used to say "1..0 # SKIP <why>" when we skip
everything, which is still kept, so that prove can notice why things
are skipped.

When we abort early but after executing any test, we used to error
out, but instead we pretend that the test finished right there, as
it seems that we are not allowed to say "1..4 # SKIP <why>" after
running 4 tests.

 t/test-lib.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 13b5696822..46f29cf112 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -745,20 +745,25 @@ test_done () {
 	fi
 	case "$test_failure" in
 	0)
-		# Maybe print SKIP message
-		if test -n "$skip_all" && test $test_count -gt 0
-		then
-			error "Can't use skip_all after running some tests"
-		fi
-		test -z "$skip_all" || skip_all=" # SKIP $skip_all"
-
 		if test $test_external_has_tap -eq 0
 		then
 			if test $test_remaining -gt 0
 			then
 				say_color pass "# passed all $msg"
 			fi
-			say "1..$test_count$skip_all"
+
+			# Maybe print SKIP message
+			test -z "$skip_all" || skip_all="# SKIP $skip_all"
+			case "$test_count" in
+			0)			    
+				say "1..$test_count${skip_all:+ $skip_all}"
+				;;
+			*)
+				test -z "$skip_all" ||
+				say_color warn "$skip_all"
+				say "1..$test_count"
+				;;
+			esac
 		fi
 
 		test -d "$remove_trash" &&


  reply	other threads:[~2017-05-17  4:23 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-16 15:55 t5545: reduced test coverage Ramsay Jones
2017-05-17  2:40 ` Junio C Hamano
2017-05-17  3:11   ` [PATCH] t5545: enhance test coverage when no http server is installed Stefan Beller
2017-05-17  3:56   ` t5545: reduced test coverage Junio C Hamano
2017-05-17  4:23     ` Junio C Hamano [this message]
2017-05-17 20:48       ` Ramsay Jones
2017-05-18  2:52         ` 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

  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=xmqqinl0xga6.fsf@gitster.mtv.corp.google.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=ramsay@ramsayjones.plus.com \
    --cc=sbeller@google.com \
    /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).