From patchwork Sun Jan 24 17:28:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= X-Patchwork-Id: 12042563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 46B0CC433E6 for ; Sun, 24 Jan 2021 17:29:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F7D522DBF for ; Sun, 24 Jan 2021 17:29:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726007AbhAXR3W (ORCPT ); Sun, 24 Jan 2021 12:29:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726103AbhAXR3K (ORCPT ); Sun, 24 Jan 2021 12:29:10 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22E6FC06174A for ; Sun, 24 Jan 2021 09:28:30 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id u14so1957782wml.4 for ; Sun, 24 Jan 2021 09:28:30 -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=NB7mhvFvUjEowPusLa+YA1W3DcEB1yfVBnq/lJzfrok=; b=K2g0Ie+NjsVKsafj2FsXZQL4HWvxLepYbacJGwddWZhYFkyxU1uY6fL4keQR0My3qr 6ylmCHDBN4B7uw7zrofQiw1clZgGze6Y/pwjHDeOKfYHN7y7CxTtAqoS/A1XbT/BNuAt ZZQoIBVSiTQpiI8kGQ9ewyQxqcbqoswuXQQ5/0lAMqr5Xc8Zc+qpCpvwZzX5F4R7hseb e0w8HM+REkgo4K1oqyhlOUV13TbOaMN8+JI/H6ktfvO2X7QhTPfPiWu5ogLgzffTAaQg u13cOgP/Fnuqvh5dX5rEZc7bJr3I19uFZJgfSFRRLoaSEmzUpllaSTc8oNSH5wRtaAXr POaA== 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=NB7mhvFvUjEowPusLa+YA1W3DcEB1yfVBnq/lJzfrok=; b=o50ckjw0lLcGDIjMVKPN5dKS6hXLXvirvqIsVfTQROJjPFKqczT0S+B3GEuI0oI0XN baVcIqXRSrZk1le3UK1lPTElTh0aodsVhF3HK/3mcAXB8OS0T4IED+RDZch+SGTidob/ li0PgjHSt4xMlyrOo0CMqXSYlsjspTcvPwJaBnt3J08URgZUcKsIabde3ymYrh9lCDzY sHqQRvnxFimsHjwGkN6I8BT1j43xagKTSU43Ro4ekFMTuMYI0Qg6VRPaMFItkNOkG7TX KwR/iAb5fR41DXye3GvGuf5RlcWwSKf8c8Oq3rlc8Fde3B+J+WoekRO6JdtHmaVf8kso luGQ== X-Gm-Message-State: AOAM533YyJ5L+DL5XKEsWwm4WpL0SaUiD8xmgT9r+KEbckxAhOMiXSRB aCPpL0X104NH9rSzj7K+avLCboaAFiMCuA== X-Google-Smtp-Source: ABdhPJyC4jJbPbs7LTDCjOuplIcJ8m/Xu2e9t9I70Jkk2F0aOjxs0NWJpzAy2fsR0AuovKIK3l3DQg== X-Received: by 2002:a1c:9ad5:: with SMTP id c204mr3876646wme.65.1611509308533; Sun, 24 Jan 2021 09:28:28 -0800 (PST) Received: from vm.nix.is (vm.nix.is. [2a01:4f8:120:2468::2]) by smtp.gmail.com with ESMTPSA id z185sm4127332wmb.0.2021.01.24.09.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 24 Jan 2021 09:28:27 -0800 (PST) From: =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= To: git@vger.kernel.org Cc: Junio C Hamano , =?utf-8?q?Carlo_Marcelo_Arenas_Bel?= =?utf-8?q?=C3=B3n?= , Johannes Schindelin , Todd Zullinger , Johannes Sixt , Ramsay Jones , =?utf-8?b?w4Z2YXIgQXJuZmrDtnI=?= =?utf-8?b?w7AgQmphcm1hc29u?= Subject: [PATCH v5 1/2] grep/pcre2 tests: don't rely on invalid UTF-8 data test Date: Sun, 24 Jan 2021 18:28:12 +0100 Message-Id: <20210124172813.9547-2-avarab@gmail.com> X-Mailer: git-send-email 2.29.2.222.g5d2a92d10f8 In-Reply-To: <20210124114855.13036-1-avarab@gmail.com> References: <20210124114855.13036-1-avarab@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org As noted in [1] when I originally added this test in [2] the test was completely broken as it lacked a redirect[3]. I now think this whole thing is overly fragile. Let's only test if we have a segfault here. Before this the first test's "test_cmp" was pretty meaningless. We were only testing if PCREv2 was so broken that it would spew out something completely unrelated on stdout, which isn't very plausible. In the second test we're relying on PCREv2 forever holding to the current behavior of the PCRE_UTF8 flag, as opposed to learning some optimistic graceful fallback to PCRE2_MATCH_INVALID_UTF in the future. If that happens having this test broken under bisecting would suck. A follow-up commit will actually test this case in a meaningful way under the PCRE2_MATCH_INVALID_UTF flag. Let's run this one unconditionally, and just make sure we don't segfault. 1. e714b898c6 (t7812: expect failure for grep -i with invalid UTF-8 data, 2019-11-29) 2. 8a5999838e (grep: stess test PCRE v2 on invalid UTF-8 data, 2019-07-26) 3. c74b3cbb83 (t7812: add missing redirects, 2019-11-26) Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t7812-grep-icase-non-ascii.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh index 03dba6685a..38457c2e4f 100755 --- a/t/t7812-grep-icase-non-ascii.sh +++ b/t/t7812-grep-icase-non-ascii.sh @@ -76,12 +76,7 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invali test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' ' test_might_fail git grep -hi "Æ" invalid-0x80 >actual && - if test -s actual - then - test_cmp expected actual - fi && - test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual && - ! test_cmp expected actual + test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual ' test_done