[PATCH] test-lib: TAP compliance for skipping tests on request

[PATCH] test-lib: TAP compliance for skipping tests on request

[Michael J Gruber]

Make the output TAP compliant for tests skipped on request (GI_SKIP_TESTS).

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
We may want to better spell out the reasons, but I think
it's good enough like this for *explicitly* skipped tests.

 t/test-lib.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 8e3de53..2076271 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -395,7 +395,7 @@ test_skip () {
 	case "$to_skip" in
 	t)
 		say_color skip >&3 "skipping test: $@"
-		say_color skip "ok $test_count: # skip $1"
+		say_color skip "ok $test_count # SKIP $1"
 		: true
 		;;
 	*)
@@ -838,7 +838,7 @@ done
 case "$to_skip" in
 t)
 	say_color skip >&3 "skipping test $this_test altogether"
-	say_color skip "skip all tests in $this_test"
+	skip_all="skip all tests in $this_test"
 	test_done
 esac
 
-- 
1.7.2.rc1.212.g850a

Re: [PATCH] test-lib: TAP compliance for skipping tests on request

[Ævar Arnfjörð Bjarmason]

On Fri, Jul 9, 2010 at 11:15, Michael J Gruber <git@drmicha.warpmail.net> wrote:
> Make the output TAP compliant for tests skipped on request (GI_SKIP_TESTS).

That "GI_SKIP_TESTS" has a T-deficit.

> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> We may want to better spell out the reasons, but I think
> it's good enough like this for *explicitly* skipped tests.
>
>  t/test-lib.sh |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 8e3de53..2076271 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -395,7 +395,7 @@ test_skip () {
>        case "$to_skip" in
>        t)
>                say_color skip >&3 "skipping test: $@"
> -               say_color skip "ok $test_count: # skip $1"
> +               say_color skip "ok $test_count # SKIP $1"

Good catch with the s/://, but I think the lower-case "skip" should
stay that way. At least that's what Test::More does:

    $ perl -MTest::More=tests,2 -E 'SKIP: { skip "no can do", 1 } pass "can do"'
    1..2
    ok 1 # skip no can do
    ok 2 - can do

It only uses upper-case on skip-all. I.e. when part of the plan line:

    $ perl -MTest::More=skip_all,"this platform sucks" -e1
    1..0 # SKIP this platform sucks

Maybe I've missed something, or Test::More has a bug.

>                : true
>                ;;
>        *)
> @@ -838,7 +838,7 @@ done
>  case "$to_skip" in
>  t)
>        say_color skip >&3 "skipping test $this_test altogether"
> -       say_color skip "skip all tests in $this_test"
> +       skip_all="skip all tests in $this_test"
>        test_done
>  esac

Good catch. I missed that (again) in my "tests: Use skip_all=<reason>
to skip tests" patch.

[PATCHv2] test-lib: TAP compliance for skipping tests on request

[Michael J Gruber]

Make the output TAP compliant for tests skipped on request (GIT_SKIP_TESTS).

Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
---
v2 has a typo fix in the commit message and the spelling of "skip"
as suggested by AAB.

I think I've read it differently in the RFC, but then I was also confused about
the "#" in the RFC, and following the "reference" implementation (as per AAB)
should be the best approach.

 t/test-lib.sh |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index bc06564..db8371c 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -396,7 +396,7 @@ test_skip () {
 	case "$to_skip" in
 	t)
 		say_color skip >&3 "skipping test: $@"
-		say_color skip "ok $test_count: # skip $1"
+		say_color skip "ok $test_count # skip $1"
 		: true
 		;;
 	*)
@@ -833,7 +833,7 @@ do
 	case "$this_test" in
 	$skp)
 		say_color skip >&3 "skipping test $this_test altogether"
-		say_color skip "skip all tests in $this_test"
+		skip_all="skip all tests in $this_test"
 		test_done
 	esac
 done
-- 
1.7.2.rc1.212.g850a

Re: [PATCHv2] test-lib: TAP compliance for skipping tests on request

[Ævar Arnfjörð Bjarmason]

On Mon, Jul 12, 2010 at 10:33, Michael J Gruber
<git@drmicha.warpmail.net> wrote:
> Make the output TAP compliant for tests skipped on request (GIT_SKIP_TESTS).
>
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
> v2 has a typo fix in the commit message and the spelling of "skip"
> as suggested by AAB.
>
> I think I've read it differently in the RFC, but then I was also confused about
> the "#" in the RFC, and following the "reference" implementation (as per AAB)
> should be the best approach.

Acked-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Re: [PATCHv2] test-lib: TAP compliance for skipping tests on request

[Junio C Hamano]

Thanks, both.