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-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_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 5F1B31F9FE for ; Tue, 9 Mar 2021 16:03:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231320AbhCIQCt (ORCPT ); Tue, 9 Mar 2021 11:02:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50824 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231826AbhCIQCg (ORCPT ); Tue, 9 Mar 2021 11:02:36 -0500 Received: from mail-wr1-x432.google.com (mail-wr1-x432.google.com [IPv6:2a00:1450:4864:20::432]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5C81C06174A for ; Tue, 9 Mar 2021 08:02:35 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id w11so16656577wrr.10 for ; Tue, 09 Mar 2021 08:02:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0+Ksm+YXLDSylV2IZUtt9+e7WSzRLpN5BWoBT21KnyA=; b=pVEmHyfDS4z+eQPCzJGFzGexRhB9eU0wlQLBsDSp3dkVIWg4HCRdNwi0TS0ZMDtr7O 0WS8zlyO1wO7FPGEX/2tOYVE1iRSOWbRmFRw3cEMPF8VaS/hXch22JpEh/oMyCneG/5v /RhlqX2AT7PesdUe+igezSvoqRS8sa80hU7/Sp+24W6PYye8C9mevOlHQ1X5gwjP26CY 97FcnsyEdTB/5wdiJf/OBCloAUZfIeZKr+kRgaQdrDHB1To33pkGgdw6fcSKdRGyJQi5 56FPM+iGQD0HEeHs5ycjTX+QoNIzcO5v55o5Cf9w9oIz04ZaJvLvFCxw7m8xSUryakbk UzWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0+Ksm+YXLDSylV2IZUtt9+e7WSzRLpN5BWoBT21KnyA=; b=SGneAPqbumakhSULQMYS+JHiMrfeN/7bvJtOOm4e1VnSq2tknYBIE9HjKtUpHmZ2hc BwUQtziBWtI59EfWG3Pu6iRE/hXOfrtAy6GrBOP3h0uWJeoM/m59JL/YQdW/b5Xb6anu OozCH/4QqosH2fV53AYA7PzzWnOdqiicd39jdpqK2ESzDETAiKs7wDx47pRx9TD0AllE pFphaLn8LgJePCgG8fBJ62C+3qICaITZfYv0YxiQsNuLbSMRqOsp7I+vKDvIRfkohixZ DnuAUEyGiqfT9N7trnloC4gcD4C2LKM+eUax/NyQjY6QxhF6gkdhK7WSsoFktn8whBAT m29Q== X-Gm-Message-State: AOAM533QhI8d/fOtHCswyu9ehcvpPgTnYyyRwD61+4DFNE9wAjgozP/r fyo/IQ5jrxTlqH00Vv3PaOj5AT/+/VL8VQ== X-Google-Smtp-Source: ABdhPJy9HrWgT2YSlGeofV9xpEwg1ZyF/23Zox8bNlanarlW8su/CAMc3uaKpVijkPCH1MPSTXYZpQ== X-Received: by 2002:a5d:591a:: with SMTP id v26mr5042971wrd.172.1615305752424; Tue, 09 Mar 2021 08:02:32 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id n6sm5089223wmd.27.2021.03.09.08.02.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Mar 2021 08:02:31 -0800 (PST) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Jeff King , =?UTF-8?q?SZEDER=20G=C3=A1bor?= , Johannes Schindelin , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH 1/7] test-lib: remove test_external Date: Tue, 9 Mar 2021 17:02:13 +0100 Message-Id: <20210309160219.13779-2-avarab@gmail.com> X-Mailer: git-send-email 2.31.0.rc1.210.g0f8085a843c In-Reply-To: <87r1kzj7xi.fsf@evledraar.gmail.com> References: <87r1kzj7xi.fsf@evledraar.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Remove the test_external function(s) in favor of running the Perl tests with a test_expect_success. The only advantage of this wrapper added in fb32c410087 (t/test-lib.sh: add test_external and test_external_without_stderr, 2008-06-19) was that we got the Test::More output as-is from the two wrapped scripts. Now we'll instead hang until the script is finished, and report on its exit code. The Test::More framework ensures that we exit with non-zero exit code on failure. My motivation for this is to eliminate a special case where things that aren't test-lib.sh are going to produce TAP, for reasons that'll be clear in subsequent commits. This also eliminates special cases I added in d998bd4ab67 (test-lib: Make the test_external_* functions TAP-aware, 2010-06-24) from test-lib.sh itself. Signed-off-by: Ævar Arnfjörð Bjarmason --- .../netrc/t-git-credential-netrc.sh | 7 +- t/README | 26 ------ t/t0202-gettext-perl.sh | 10 +-- t/t9700-perl-git.sh | 10 +-- t/test-lib-functions.sh | 89 +------------------ t/test-lib.sh | 42 ++++----- 6 files changed, 28 insertions(+), 156 deletions(-) diff --git a/contrib/credential/netrc/t-git-credential-netrc.sh b/contrib/credential/netrc/t-git-credential-netrc.sh index 07227d02287..28118a9e194 100755 --- a/contrib/credential/netrc/t-git-credential-netrc.sh +++ b/contrib/credential/netrc/t-git-credential-netrc.sh @@ -20,13 +20,10 @@ 'set up test repository' \ 'git config --add gpg.program test.git-config-gpg' - # The external test will outputs its own plan - test_external_has_tap=1 - export PERL5LIB="$GITPERLLIB" - test_external \ - 'git-credential-netrc' \ + test_expect_success 'git-credential-netrc' ' perl "$GIT_BUILD_DIR"/contrib/credential/netrc/test.pl + ' test_done ) diff --git a/t/README b/t/README index 593d4a4e270..2cc8cbc7185 100644 --- a/t/README +++ b/t/README @@ -844,32 +844,6 @@ library for your script to use. test_done fi - - test_external []