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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.7 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,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 7996F1F4B4 for ; Thu, 8 Apr 2021 15:04:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231916AbhDHPE5 (ORCPT ); Thu, 8 Apr 2021 11:04:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232030AbhDHPEv (ORCPT ); Thu, 8 Apr 2021 11:04:51 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB997C061760 for ; Thu, 8 Apr 2021 08:04:39 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id r9so3626026ejj.3 for ; Thu, 08 Apr 2021 08:04:39 -0700 (PDT) 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=CAPteERdEhAr6OGxgQx6OOB8R3UU43fTi2ZVYcOHEjE=; b=oJoFQ7JqiN0qYkBBO88nCtQx7zhyUBjdEM4/IS7QBsMH2yiN1V98fC5dXz0I4h1Jh0 G2TnMdoqunxEuo04jH6SdRSPI00bZe/sk358jofLHzHXqFonAZ4gaCIH0iIVk3okCsjh VkX/5mwbso5NVKrJ8s8GOQ7Y6IaHQs+rQMfKrOU5dt8ylaUGdnklyOYXJqBBQdO+VTBH PredaGzimqRTDNu2/DQWzaIWKcvIrnv67yPRHwbDubNbY66gM9PIIZ7btOx2AB/O1/3C ABLrJ7NVJ5dxlMuapXSLd0D4JzL7i+RbOY/En+evgx0E+PvpYFyiEvTOl9Ysaj0KaEcO Mkkg== 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=CAPteERdEhAr6OGxgQx6OOB8R3UU43fTi2ZVYcOHEjE=; b=DihWVod1galcXWyBXbAbScIRAkOy90WB5z5WGm3myfWrgc5WpUSuVkGMH0TA4n9HMR EFnslCo0dBYcoNTAPHz8jk/NEeCKUj5qwNmUKIHG3BW0yrbY2xFbMFpEXQtRRX2QZ/m1 6/h3TJjSbTo6xdRhDaPZTjyWkeXPllOyHk6gAxhuqkLh1tC6lhuFJK7jUChtdMjDrCJy cAgtqw5xK7yYn7JRVfGbfDvcJbSNzCeJ+HO2tW7Sv5b3hkjtXU2blyLo+AUDKoxkbEfD AjBUSGDYD3hmxuwKFtVtUCheNIB93FvjJ/nsCXySA2KheetkELrTCZDLfCiM21f6NEC/ 94AQ== X-Gm-Message-State: AOAM531rmtOvke1Bi649rYqtHvaWmL+lXnGQKH8Lrce+TsCt7sWfWAOl s1e0AHVj/Eob6bZInJ0cNL6qzG6fupASjQ== X-Google-Smtp-Source: ABdhPJxY0ej3Rkx84O/nFUhPXN55lIsR9znSMRNCRDWeB88DfR0hk51xdgy7d+pmd0+2P5mMAUVZLA== X-Received: by 2002:a17:906:7947:: with SMTP id l7mr3315593ejo.380.1617894278380; Thu, 08 Apr 2021 08:04:38 -0700 (PDT) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id h25sm2479253ejx.105.2021.04.08.08.04.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 08:04:37 -0700 (PDT) From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= To: git@vger.kernel.org Cc: Junio C Hamano , Johannes Sixt , Jeff King , Jonathan Nieder , Philippe Blain , Adam Spiers , Eric Sunshine , Chris Torek , =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Subject: [PATCH v5 7/9] userdiff: remove support for "broken" tests Date: Thu, 8 Apr 2021 17:04:22 +0200 Message-Id: X-Mailer: git-send-email 2.31.1.527.g9b8f7de2547 In-Reply-To: References: 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 There have been no "broken" tests since 75c3b6b2e8 (userdiff: improve Fortran xfuncname regex, 2020-08-12). Let's remove the test support for them. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t4018-diff-funcname.sh | 8 +------- t/t4018/README | 3 --- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh index 409372f3a4..740696c8f7 100755 --- a/t/t4018-diff-funcname.sh +++ b/t/t4018-diff-funcname.sh @@ -94,13 +94,7 @@ test_expect_success 'setup hunk header tests' ' # check each individual file for i in $(git ls-files) do - if grep broken "$i" >/dev/null 2>&1 - then - result=failure - else - result=success - fi - test_expect_$result "hunk header: $i" " + test_expect_success "hunk header: $i" " git diff -U1 $i >actual && grep '@@ .* @@.*RIGHT' actual " diff --git a/t/t4018/README b/t/t4018/README index 283e01cca1..2d25b2b4fc 100644 --- a/t/t4018/README +++ b/t/t4018/README @@ -7,9 +7,6 @@ at least two lines from the line that must appear in the hunk header. The text that must appear in the hunk header must contain the word "right", but in all upper-case, like in the title above. -To mark a test case that highlights a malfunction, insert the word -BROKEN in all lower-case somewhere in the file. - This text is a bit twisted and out of order, but it is itself a test case for the default hunk header pattern. Know what you are doing if you change it. -- 2.31.1.527.g9b8f7de2547