git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Todd Zullinger <tmz@pobox.com>
Cc: git@vger.kernel.org, Charvi Mendiratta <charvi077@gmail.com>,
	Christian Couder <chriscool@tuxfamily.org>,
	Phillip Wood <phillip.wood123@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] t7500: remove non-existant C_LOCALE_OUTPUT prereq
Date: Mon, 17 May 2021 18:42:34 +0200	[thread overview]
Message-ID: <87wnrxqphw.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <20210517151222.2865093-1-tmz@pobox.com>


On Mon, May 17 2021, Todd Zullinger wrote:

> The C_LOCALE_OUTPUT prerequisite was removed in b1e079807b (tests:
> remove last uses of C_LOCALE_OUTPUT, 2021-02-11), where Ævar noted:
>
>     I'm not leaving the prerequisite itself in place for in-flight changes
>     as there currently are none that introduce new tests that rely on it,
>     and because C_LOCALE_OUTPUT is currently a noop on the master branch
>     we likely won't have any new submissions that use it.
>
> One more use of C_LOCALE_OUTPUT did creep in with 3d1bda6b5b (t7500: add
> tests for --fixup=[amend|reword] options, 2021-03-15).  This causes a
> number of the tests to be skipped by default:
>
>     ok 35 # SKIP --fixup=reword: incompatible with --all (missing C_LOCALE_OUTPUT)
>     ok 36 # SKIP --fixup=reword: incompatible with --include (missing C_LOCALE_OUTPUT)
>     ok 37 # SKIP --fixup=reword: incompatible with --only (missing C_LOCALE_OUTPUT)
>     ok 38 # SKIP --fixup=reword: incompatible with --interactive (missing C_LOCALE_OUTPUT)
>     ok 39 # SKIP --fixup=reword: incompatible with --patch (missing C_LOCALE_OUTPUT)
>
> Remove the C_LOCALE_OUTPUT prerequisite from these tests so they are
> not skipped.
>
> Signed-off-by: Todd Zullinger <tmz@pobox.com>
> ---
> I noticed this while testing 2.32.0-rc0.  I grep for skipped tests to help me
> catch missing requirements in the Fedora packages.
>
>  t/t7500-commit-template-squash-signoff.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
> index 9092db5fdc..7d02f79c0d 100755
> --- a/t/t7500-commit-template-squash-signoff.sh
> +++ b/t/t7500-commit-template-squash-signoff.sh
> @@ -413,7 +413,7 @@ test_expect_success 'amend! commit allows empty commit msg body with --allow-emp
>  '
>  
>  test_fixup_reword_opt () {
> -	test_expect_success C_LOCALE_OUTPUT "--fixup=reword: incompatible with $1" "
> +	test_expect_success "--fixup=reword: incompatible with $1" "
>  		echo 'fatal: reword option of --fixup is mutually exclusive with'\
>  			'--patch/--interactive/--all/--include/--only' >expect &&
>  		test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&

Thanks. This is obviously correct.

Junio (added to CC): I also think it makes sense to pull this into rc1,
since we have 3d1bda6b5b new in 2.32.0, and will be skipping this part
of its tests everywhere without this patc.h

  reply	other threads:[~2021-05-17 16:51 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-17 15:12 [PATCH] t7500: remove non-existant C_LOCALE_OUTPUT prereq Todd Zullinger
2021-05-17 16:42 ` Ævar Arnfjörð Bjarmason [this message]
2021-05-17 19:46   ` 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=87wnrxqphw.fsf@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=charvi077@gmail.com \
    --cc=chriscool@tuxfamily.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood123@gmail.com \
    --cc=tmz@pobox.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).