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.8 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 CA20E1F54E for ; Sat, 3 Sep 2022 05:08:16 +0000 (UTC) Authentication-Results: dcvr.yhbt.net; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="q3/zXhEO"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbiICFHr (ORCPT ); Sat, 3 Sep 2022 01:07:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54548 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230102AbiICFHp (ORCPT ); Sat, 3 Sep 2022 01:07:45 -0400 Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F40D1F4CAC for ; Fri, 2 Sep 2022 22:07:44 -0700 (PDT) Received: by mail-qv1-xf36.google.com with SMTP id y15so2936207qvn.2 for ; Fri, 02 Sep 2022 22:07:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date; bh=jfrJjh32kTAyQAQ/cPMTIEp6ceJs1YpAg7kpkt6R3Ks=; b=q3/zXhEOQXuWUB9Yz8eAvWGxGmqdFKsFv9oeSAwZUsnaLpVvKQmgomdrfVDOEEl3h6 GHRhJRTAGgOVZiG2WjA4GxFBHDS5+D7WnGX0RjIGvgmEUi0Pln2iOdZ9mQc4uz0YYOyT bhAR0E9YdRw4eTJdTKNaDQRNOPgvr74ClsvlSzcKRssAypv73CCZTFEUqeV3Cg1LGoD3 Dzg/Xbr1MVUnM+5rFyAAdyJNVCClUX1IxlL0PclSuxw4h6I+nB4Zox4BU7GVjYtKc47Y HIA+Vx8Ay4kgJEesDV1V8L9ZdXhWm6S78bjljYCjbakWIYSabF9RQi0OObx5I9ezp5G6 d1xA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date; bh=jfrJjh32kTAyQAQ/cPMTIEp6ceJs1YpAg7kpkt6R3Ks=; b=396omu1Hpq2UCxpvZU2C/G08XOysVpizdW4Zf0kYhGLtoZGDAnj1gcAO9GmDo1eOHe RlvieWg1sG5FvbVAuMWS9AOvCBYD9cTk+9fT4Ky4+7Qaj0pDvibcLCyHSVZYJTNqvZ6Q kuBJApqx+dRqk9s0W1bsDcoXx9sQFGunqE2OfTQPQl0tpEmznaaR34Jyt+Ac7hsmWxVf ByBQ2gXR1hSHrJu6Gk8VdH+oxmdVGVbmBcst0Cr2yXWZyb8m8yQK5g6nIpJ7o+d+S1eh zaD0ZxiQaXFII4uiQlCw4sz2oA4ZLatYgDbK1iPvIaGVNQjz3vXWh8dYs2qUCX8EaMPF gi5g== X-Gm-Message-State: ACgBeo3cJOCVUW7KwkdgPwDQCUN5P1b71Rovixt58OAq7rjOaAI2AKgy vb9vO9w92AGtE2kTKpYjn/pAzhZmRKjnJ3w3Eirpku36nEg= X-Google-Smtp-Source: AA6agR5utIk14S0CGa6UfbwBC+v9YSE+JH3DBTu+98isPPLlM5c3TwNj8h3lBi1uLLTy4MmhvD9//T9lpWptfCMBWVE= X-Received: by 2002:a0c:8b92:0:b0:496:c8ff:b4c7 with SMTP id r18-20020a0c8b92000000b00496c8ffb4c7mr30485237qva.115.1662181664067; Fri, 02 Sep 2022 22:07:44 -0700 (PDT) MIME-Version: 1.0 References: <9589f2a6e495034cc4f45bd0bce80dedfcd30f16.1661992197.git.gitgitgadget@gmail.com> In-Reply-To: <9589f2a6e495034cc4f45bd0bce80dedfcd30f16.1661992197.git.gitgitgadget@gmail.com> From: Elijah Newren Date: Fri, 2 Sep 2022 22:07:33 -0700 Message-ID: Subject: Re: [PATCH 16/18] test-lib: replace chainlint.sed with chainlint.pl To: Eric Sunshine via GitGitGadget Cc: Git Mailing List , Jeff King , =?UTF-8?B?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Fabian Stelzer , Johannes Schindelin , Eric Sunshine Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org On Wed, Aug 31, 2022 at 5:30 PM Eric Sunshine via GitGitGadget wrote: > > From: Eric Sunshine > > By automatically invoking chainlint.sed upon each test it runs, > `test_run_` in test-lib.sh ensures that broken &&-chains will be > detected early as tests are modified or new are tests created since it s/new are tests created/new tests are created/ ? > is typical to run a test script manually (i.e. `./t1234-test-script.sh`) > during test development. Now that the implementation of chainlint.pl is > complete, modify test-lib.sh to invoke it automatically instead of > chainlint.sed each time a test script is run. > > This change reduces the number of "linter" invocations from 26800+ (once > per test run) down to 1050+ (once per test script), however, a > subsequent change will drop the number of invocations to 1 per `make > test`, thus fully realizing the benefit of the new linter. > > Note that the "magic exit code 117" &&-chain checker added by bb79af9d09 > (t/test-lib: introduce --chain-lint option, 2015-03-20) which is built > into t/test-lib.sh is retained since it has near zero-cost and > (theoretically) may catch a broken &&-chain not caught by chainlint.pl. > > Signed-off-by: Eric Sunshine > --- > contrib/buildsystems/CMakeLists.txt | 2 +- > t/test-lib.sh | 9 +++++++-- > 2 files changed, 8 insertions(+), 3 deletions(-) > > diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt > index 2237109b57f..ca358a21a5f 100644 > --- a/contrib/buildsystems/CMakeLists.txt > +++ b/contrib/buildsystems/CMakeLists.txt > @@ -1076,7 +1076,7 @@ if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH}) > "string(REPLACE \"\${GIT_BUILD_DIR_REPL}\" \"GIT_BUILD_DIR=\\\"$TEST_DIRECTORY/../${BUILD_DIR_RELATIVE}\\\"\" content \"\${content}\")\n" > "file(WRITE ${CMAKE_SOURCE_DIR}/t/test-lib.sh \${content})") > #misc copies > - file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed DESTINATION ${CMAKE_BINARY_DIR}/t/) > + file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.pl DESTINATION ${CMAKE_BINARY_DIR}/t/) > file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/) > file(COPY ${CMAKE_SOURCE_DIR}/mergetools/tkdiff DESTINATION ${CMAKE_BINARY_DIR}/mergetools/) > file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/) > diff --git a/t/test-lib.sh b/t/test-lib.sh > index dc0d0591095..a65df2fd220 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -1091,8 +1091,7 @@ test_run_ () { > trace= > # 117 is magic because it is unlikely to match the exit > # code of other programs > - if $(printf '%s\n' "$1" | sed -f "$GIT_BUILD_DIR/t/chainlint.sed" | grep -q '?![A-Z][A-Z]*?!') || > - test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)" > + if test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)" > then > BUG "broken &&-chain or run-away HERE-DOC: $1" > fi > @@ -1588,6 +1587,12 @@ then > BAIL_OUT_ENV_NEEDS_SANITIZE_LEAK "GIT_TEST_SANITIZE_LEAK_LOG=true" > fi > > +if test "${GIT_TEST_CHAIN_LINT:-1}" != 0 > +then > + "$PERL_PATH" "$TEST_DIRECTORY/chainlint.pl" "$0" || > + BUG "lint error (see '?!...!? annotations above)" > +fi > + > # Last-minute variable setup > USER_HOME="$HOME" > HOME="$TRASH_DIRECTORY" > -- > gitgitgadget >