Re: [PATCH v3 2/2] tests(mingw): avoid very slow `mingw_test_cmp`
- From
Johannes Sixt <j6t@kdbg.org>
- Date
- Nov 21, 2022, 17:49 UTC
- Message-ID
- <f0411dd9-bccb-b5d3-ed51-59be6b627a30@kdbg.org>
- In-Reply-To
- <f5d6c063-2fc4-4355-57e1-056eac1fb4a2@web.de>
Am 19.11.22 um 18:50 schrieb René Scharfe:
> And with the following patch on top of eea7033409 (The twelfth batch, > 2022-11-14) the test suite passes for me -- just one case of grep > stealing CRs seems to need adjustment to make mingw_test_cmp > unnecessary:
Wow, nice catch! Just let enough time pass, and a liability such as mingw_test_cmp becomes obsolete by mere magic. ;)
Show 15 quoted lines
>
> t/t3920-crlf-messages.sh | 2 +-
> t/test-lib.sh | 1 -
> 2 files changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
> index 4c661d4d54..353b1a550e 100755
> --- a/t/t3920-crlf-messages.sh
> +++ b/t/t3920-crlf-messages.sh
> @@ -12,7 +12,7 @@ create_crlf_ref () {
> cat >.crlf-orig-$branch.txt &&
> cat .crlf-orig-$branch.txt | append_cr >.crlf-message-$branch.txt &&
> grep 'Subject' .crlf-orig-$branch.txt | tr '\n' ' ' | sed 's/[ ]*$//' | tr -d '\n' >.crlf-subject-$branch.txt &&
> - grep 'Body' .crlf-message-$branch.txt >.crlf-body-$branch.txt || true &&
> + grep 'Body' .crlf-orig-$branch.txt | append_cr >.crlf-body-$branch.txt || true &&This || true looks suspicious. I'll submit a patch in a new thread.
Show 15 quoted lines
> LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" &&
> test_tick &&
> hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) &&
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 6db377f68b..af5ec357e5 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -1721,7 +1721,6 @@ case $uname_s in
> test_set_prereq SED_STRIPS_CR
> test_set_prereq GREP_STRIPS_CR
> test_set_prereq WINDOWS
> - GIT_TEST_CMP=mingw_test_cmp
> ;;
> *CYGWIN*)
> test_set_prereq POSIXPERM