From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id C1C3B1F910 for ; Mon, 21 Nov 2022 17:49:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230052AbiKURtQ (ORCPT ); Mon, 21 Nov 2022 12:49:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229969AbiKURtO (ORCPT ); Mon, 21 Nov 2022 12:49:14 -0500 Received: from bsmtp3.bon.at (bsmtp3.bon.at [213.33.87.17]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53496D02CB for ; Mon, 21 Nov 2022 09:49:12 -0800 (PST) Received: from [192.168.0.98] (unknown [93.83.142.38]) by bsmtp3.bon.at (Postfix) with ESMTPSA id 4NGFJ30SX0z5tl9; Mon, 21 Nov 2022 18:49:06 +0100 (CET) Message-ID: Date: Mon, 21 Nov 2022 18:49:06 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.0 Subject: Re: [PATCH v3 2/2] tests(mingw): avoid very slow `mingw_test_cmp` Content-Language: en-US To: =?UTF-8?Q?Ren=c3=a9_Scharfe?= Cc: Johannes Schindelin via GitGitGadget , git@vger.kernel.org, =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Johannes Schindelin , Taylor Blau , Junio C Hamano References: <65ff24be-4392-f236-5500-ce0c0d4d42ca@kdbg.org> From: Johannes Sixt In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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. ;) > > 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. > 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