From patchwork Wed Jan 11 23:32:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 13097298 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92AA9C46467 for ; Wed, 11 Jan 2023 23:32:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235548AbjAKXcw (ORCPT ); Wed, 11 Jan 2023 18:32:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232981AbjAKXct (ORCPT ); Wed, 11 Jan 2023 18:32:49 -0500 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8ABC73632F for ; Wed, 11 Jan 2023 15:32:47 -0800 (PST) Received: by mail-wr1-x435.google.com with SMTP id r2so16536343wrv.7 for ; Wed, 11 Jan 2023 15:32:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0k7N7ohS0gxiDug/lRh3vyxraxcvAVKVNR9vUKBU/AA=; b=TsQy8ItNABDA7hgG3R5INGtAU5h1LjoJfVH1XRDfKHU/wQ8H0ZgEoSHGvWzZu77GbC hCqIY95mBFus7JgHaA7lUwwRzD0QMMGPMn2pRA3FRheClN/YccpzxoEwk007F+DHcriz g+Clg9ya6HlyU1bVHN+9M8EO0PgyX/DOo1vbEcWeFifUyqexuxsl11nh8pkTc46sDuOC OPC6NCpX7aeGoq/SriHrPLxb3Qs51mtwIWhRrmPK9sUj5N8bQ16x3ufXZ+pyBWfOE+0X Uxe9eL4gX15j/sisoDANGnTvRU9CKj/U0c7xL9xx/9IeMAJASxC730n+FRaDrudX4EeB TsZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0k7N7ohS0gxiDug/lRh3vyxraxcvAVKVNR9vUKBU/AA=; b=LC6UIqenT/+PAMNNgjkZUE6YdnaO4FZIQyEP+YPw3VbQzlfaO5q2IWxvegTXkQJNWd WHtNyxkuHUuA+y13Ts8DEikxMBGQcKIJJk3BaFgQf7CPyMnfs0zrLidFbUv2Pl1yy4ZQ CC4vSFVVWCEr2aJQDNEaTGW8sFn4X7mog1HMD2jnolCNh9si/3Q2cLnFOEzWTSnrRgPW mDyy0NbjTjJjmWBN5va0c1ykt2TyJiRxLlATVjupauSWFeJiL+KLzKyHq/+aRtRQQIuU r2MAx7iYVKcvZYGTwvHsEKYgATj2UToAMaCk9qc/CkXVjoU//imXT/J+63DCukXmYQ6g tu6g== X-Gm-Message-State: AFqh2kolyOQRmN3fUbtT1vqkCBN8rcHNetF8Lq4xSKVHoQqf6sKuoFJh Ybl34JmAzSmKoZfjv1zYLtRLcfv1H2imwDYZ+Dw= X-Google-Smtp-Source: AMrXdXsWcdKN2JlYiiCLFTEdpsq49f0SABxQ4vG6DeNEbbfm8JUToOfv2JAsRMf4Sjnjz1Svm7IGbA== X-Received: by 2002:a05:6000:1e11:b0:2bb:366b:d5e1 with SMTP id bj17-20020a0560001e1100b002bb366bd5e1mr16066247wrb.30.1673479965927; Wed, 11 Jan 2023 15:32:45 -0800 (PST) Received: from titov.fritz.box ([212.102.57.19]) by smtp.gmail.com with ESMTPSA id n1-20020a5d67c1000000b002bc7f64efa3sm7679308wrw.29.2023.01.11.15.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 15:32:45 -0800 (PST) From: Andrei Rybak To: git@vger.kernel.org Cc: Jon Seymour Subject: [PATCH v1 1/3] t6003: uncomment test '--max-age=c3, --topo-order' Date: Thu, 12 Jan 2023 00:32:40 +0100 Message-Id: <20230111233242.16870-2-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111233242.16870-1-rybak.a.v@gmail.com> References: <20230111233242.16870-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Test '--max-age=c3, --topo-order' in t6003-rev-list-topo-order.sh has been commented out as failing since its introduction in [1]. However, the test is successful at least since commit [2] -- bisecting further is harder because of incompatibility of such old Git code with modern header file [3]. Uncomment this test to gain test coverage. [1] f573571a21 ([PATCH] Add t/t6003 with some --topo-order tests, 2005-07-07) [2] 765ac8ec46 (Rip out merge-order and make "git log ..." work again., 2006-02-28) [3] BIGNUM used in git's `epoch.c` which was removed in [2] changed significantly between OpenSSL 1.0.2 and OpenSSL 1.1.0 See also https://stackoverflow.com/a/42295243/1083697 and https://lore.kernel.org/git/Y71qiCs+oAS2OegH@coredump.intra.peff.net/ Signed-off-by: Andrei Rybak --- t/t6003-rev-list-topo-order.sh | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/t/t6003-rev-list-topo-order.sh b/t/t6003-rev-list-topo-order.sh index 1f7d7dd20c..5cf2cee74d 100755 --- a/t/t6003-rev-list-topo-order.sh +++ b/t/t6003-rev-list-topo-order.sh @@ -326,19 +326,16 @@ a2 c3 EOF -# -# this test fails on --topo-order - a fix is required -# -#test_output_expect_success '--max-age=c3, --topo-order' "git rev-list --topo-order --max-age=$(commit_date c3) l5" < X-Patchwork-Id: 13097299 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 008A5C54EBC for ; Wed, 11 Jan 2023 23:32:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235824AbjAKXcy (ORCPT ); Wed, 11 Jan 2023 18:32:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234049AbjAKXct (ORCPT ); Wed, 11 Jan 2023 18:32:49 -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 578A736331 for ; Wed, 11 Jan 2023 15:32:48 -0800 (PST) Received: by mail-wr1-x432.google.com with SMTP id bn26so16567565wrb.0 for ; Wed, 11 Jan 2023 15:32:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bnsmLQS+P4MnCtSg32sdfoYiAIs2bztkcm9LmhmbITQ=; b=AdThVn6lYSdlwplpH6naJNizl9CGUmBcJMUfXj2MEo8LVm++snZqhkQcoasTUy0LIO tkCQugr7WxhcfqY6HfR8VI3Q6aCmDx4snSOofPWRU7quiceGi8jeTh5s/gbc8hxALDxZ VsOy5iFi+K/X6YGCHpbvXahx0TcTQ/dCMPlaE8D/QXKaYRaoGJRTRj8srTUNU4sWuUn3 3UyA1Ys84ptNkkm3VnaJB5vN2N+ju9MCA9//2IpLvLfFnvxqGWkUImgj8rmrzn7o1Go9 dJ6QKnpV72gd0hDo2eFs7Lz0fkx+cLMvBmohVdYiE2B2W1b5TtV28SseSHwM5szrIoEK FUAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bnsmLQS+P4MnCtSg32sdfoYiAIs2bztkcm9LmhmbITQ=; b=3pKvS+zCfz34tfhC8dZLGjk5fRhFkAF6+kYpCnU6L6bUOt0Ejtmp2eP/hr3+52egPQ ZoBerv5qSHslBxggGk0gRwDlt8K2IOlBxEagSPKKSGEuG8s54DBpx9IPZls2TyHOlXgF TpTqzhdHJu7flv0x1A8kF1WLm99XC7M7X8CXLSOUKCXRwPMVR80Mp/wo8jYaQGboJ+cW rUzrUJX1eSHfliE1k9cT3YYu/YmS/ZjHUuZevN4GtSIBgLB15BUh9SATmnjccHPFZW/8 +W8gn8PPEiZcaLs9KJz9lMfW8FM2lKibnyHN1ra8NE0iGo4e6YrxQY4n8yaU/FNCvlOq TutQ== X-Gm-Message-State: AFqh2kq0PrWnJ7OeieltrY8AV9zYr/nYaIyfsCqarO46fl/mKAdohKh3 buI95Nk+LqsbH/lddwu2xKXS+fhn7hCGwvr2QN4= X-Google-Smtp-Source: AMrXdXtNNgrUddxsSoCNrSCRHLUNfAth3MSSKA8rpdScWS3u26yNnSVparBHCxqvZNYEiUjoAMH1DQ== X-Received: by 2002:adf:f9cb:0:b0:285:d0ba:92e2 with SMTP id w11-20020adff9cb000000b00285d0ba92e2mr36539298wrr.47.1673479966668; Wed, 11 Jan 2023 15:32:46 -0800 (PST) Received: from titov.fritz.box ([212.102.57.19]) by smtp.gmail.com with ESMTPSA id n1-20020a5d67c1000000b002bc7f64efa3sm7679308wrw.29.2023.01.11.15.32.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 15:32:46 -0800 (PST) From: Andrei Rybak To: git@vger.kernel.org Cc: Elijah Newren Subject: [PATCH v1 2/3] t6422: drop commented out code Date: Thu, 12 Jan 2023 00:32:41 +0100 Message-Id: <20230111233242.16870-3-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111233242.16870-1-rybak.a.v@gmail.com> References: <20230111233242.16870-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org In commit [1] tests in t6422-merge-rename-corner-cases.sh were refactored to not run setup steps separately. This included replacing all tests like test_expect_success "setup ..." ' ' with corresponding Shell functions test_setup_... () { } During this replacement first and last lines of one of such tests got left commented out in code. Drop these lines to avoid confusion. [1] da1e295e00 (t604[236]: do not run setup in separate tests, 2019-10-22) Signed-off-by: Andrei Rybak --- t/t6422-merge-rename-corner-cases.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/t/t6422-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh index 346253c7c8..076b6a74d5 100755 --- a/t/t6422-merge-rename-corner-cases.sh +++ b/t/t6422-merge-rename-corner-cases.sh @@ -1159,7 +1159,6 @@ test_conflicts_with_adds_and_renames() { # 4) There should not be any three~* files in the working # tree test_setup_collision_conflict () { - #test_expect_success "setup simple $sideL/$sideR conflict" ' git init simple_${sideL}_${sideR} && ( cd simple_${sideL}_${sideR} && @@ -1236,7 +1235,6 @@ test_conflicts_with_adds_and_renames() { fi && test_tick && git commit -m R ) - #' } test_expect_success "check simple $sideL/$sideR conflict" ' From patchwork Wed Jan 11 23:32:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrei Rybak X-Patchwork-Id: 13097300 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C1CBC5479D for ; Wed, 11 Jan 2023 23:32:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231493AbjAKXc4 (ORCPT ); Wed, 11 Jan 2023 18:32:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234951AbjAKXcu (ORCPT ); Wed, 11 Jan 2023 18:32:50 -0500 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28D8E37245 for ; Wed, 11 Jan 2023 15:32:49 -0800 (PST) Received: by mail-wr1-x431.google.com with SMTP id t5so12129008wrq.1 for ; Wed, 11 Jan 2023 15:32:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7sXbcH64KXpaIto/069xqUxvkcKj3MsUYqnuXX2r+Xw=; b=YYnEiZBOjRxf3WzW27DrAbryVBjN9DYlJy3mWxDoL4gvB4roUcyF8CSflRgTEX0gBN V83DM2IwdGtxgiQP2aVi0q6XsYYpU6RWqQzkVk7i2TUwuyt9xMszg2uE9eN594rAIL3q JQQ5C8GiMO23w3bVV+oBZkKU80IyaCakL+50Zshbl1u3lomNm7XqwIB1DgK70PPkKU1g FOd39R95CRoCoNh19dsuNy1N7dhAtoNDpr7yRq819lYhHOYRojG2iTiNsYzrCuaEhBBY NwSE7j4WatuUJvNJPj+731XPWqMNAgfEY25cuHCJaxRC1FVqE+v9X+AyEmXJe90m6ICH rhig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7sXbcH64KXpaIto/069xqUxvkcKj3MsUYqnuXX2r+Xw=; b=GKHU82KDtBy54jLfW69RqFy1vEByjMcVWsG7hjz8F9RiOtWLa9KM29mu4P46tzcYZj 0Z7aFEXoupMcuLugo1j7zXQ4PNwYrU9X4My30wb1LHRbCM3/220jb8d4Y1Pm1AX/N7Y2 Ta5Gq6Ki41MdCIny8ulSyDJ7cAzYuVw36UFmnwYnJm+1XCLBDx1WD0T9EmEAQmRrfHRJ 2lJAN8dlwh7iSbO9uwOM5hEV37FIBJgTVXZ9TqmQIkbJc3Nih35eDU/j4M+MCqZUgEWK 6+MQl9ddlXuOR55k0W390nqRaHsclxJbPAqtGUBDquiiIDnG8BaWDXbrCx90Ww1DPqJZ 5rUw== X-Gm-Message-State: AFqh2kr0DduIt+2B5QaIlAiYWX9AQPVGFCwv5tWn1hGavoSsDzTkZOCn rdF0GAFKZUtd4JfhtFKPfq91aBh0JZHD+7dHi9Y= X-Google-Smtp-Source: AMrXdXv0sp3ahcL8gKO+yjMOfPCd/U9ZVkxn/l5h8JzvMhFxQ+jT+YwPhyHfQpOd2HgH8SfU6Avcsw== X-Received: by 2002:adf:e303:0:b0:242:1926:783c with SMTP id b3-20020adfe303000000b002421926783cmr46592217wrj.58.1673479967502; Wed, 11 Jan 2023 15:32:47 -0800 (PST) Received: from titov.fritz.box ([212.102.57.19]) by smtp.gmail.com with ESMTPSA id n1-20020a5d67c1000000b002bc7f64efa3sm7679308wrw.29.2023.01.11.15.32.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Jan 2023 15:32:46 -0800 (PST) From: Andrei Rybak To: git@vger.kernel.org Cc: Jeff Hostetler Subject: [PATCH v1 3/3] t7527: use test_when_finished in 'case insensitive+preserving' Date: Thu, 12 Jan 2023 00:32:42 +0100 Message-Id: <20230111233242.16870-4-rybak.a.v@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230111233242.16870-1-rybak.a.v@gmail.com> References: <20230111233242.16870-1-rybak.a.v@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Most tests in t7527-builtin-fsmonitor.sh that start a daemon, use the helper function test_when_finished with stop_daemon_delete_repo. Function stop_daemon_delete_repo explicitly stops the daemon. Calling it via test_when_finished is needed for tests that don't check daemon's automatic shutdown logic [1] and it is needed to avoid daemons being left running in case of breakage of the logic of automatic shutdown of the daemon. Unlike these tests, test 'case insensitive+preserving' added in [2] has a call to function test_when_finished commented out. It was commented out in all versions of the patch [2] during development [3]. This seems to not be intentional, because neither commit message in [2], nor the comment above the test mention this line being commented out. Compare it, for example, to "# unicode_debug=true" which is explicitly described by a documentation comment above it. Uncomment test_when_finished for stop_daemon_delete_repo in test 'case insensitive+preserving' to ensure that daemons are not left running in cases when automatic shutdown logic of daemon itself is broken. [1] See documentation in "fsmonitor--daemon.h" for details. [2] caa9c37ec0 (t7527: test FSMonitor on case insensitive+preserving file system, 2022-05-26) [3] See mailing list thread https://lore.kernel.org/git/41f8cbc2ae45cb86e299eb230ad3cb0319256c37.1653601644.git.gitgitgadget@gmail.com/T/#t Signed-off-by: Andrei Rybak --- t/t7527-builtin-fsmonitor.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/t7527-builtin-fsmonitor.sh b/t/t7527-builtin-fsmonitor.sh index 76d0220daa..2c271b4d7e 100755 --- a/t/t7527-builtin-fsmonitor.sh +++ b/t/t7527-builtin-fsmonitor.sh @@ -910,7 +910,7 @@ test_expect_success "submodule absorbgitdirs implicitly starts daemon" ' # the file/directory. # test_expect_success CASE_INSENSITIVE_FS 'case insensitive+preserving' ' -# test_when_finished "stop_daemon_delete_repo test_insensitive" && + test_when_finished "stop_daemon_delete_repo test_insensitive" && git init test_insensitive &&