From patchwork Fri Sep 14 14:37:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10600845 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A601F933 for ; Fri, 14 Sep 2018 14:37:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 887102B82C for ; Fri, 14 Sep 2018 14:37:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7CA0D2B837; Fri, 14 Sep 2018 14:37:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2FBF42B82C for ; Fri, 14 Sep 2018 14:37:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbeINTw3 (ORCPT ); Fri, 14 Sep 2018 15:52:29 -0400 Received: from mail-by2nam03on0100.outbound.protection.outlook.com ([104.47.42.100]:51842 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726902AbeINTw2 (ORCPT ); Fri, 14 Sep 2018 15:52:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=0oMUiEsoeRAqnibtQl9NoOLq75L4gEmrE05f67FU7T8=; b=NqJn2dvxS8RLci4nZulEYtuxqOhjhLJjVwycdn0ARWzPYPUXFvDwovEEohJDlSxzNs14sXNRcljXzuyTVI0/JkO1v26zX6gHrxyET6Pix+5TY1ZS2AaShAOzSAH9/BA/8QHRjS2/qch0bvwv1oz/HM0LOnEZzEZCKdsuBvw652w= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB0972.namprd21.prod.outlook.com (52.132.146.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.5; Fri, 14 Sep 2018 14:37:26 +0000 Received: from MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7]) by MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7%2]) with mapi id 15.20.1164.008; Fri, 14 Sep 2018 14:37:26 +0000 From: Ben Peart To: "git@vger.kernel.org" CC: "gitster@pobox.com" , "t.gummerer@gmail.com" , "avarab@gmail.com" , Ben Peart , Ben Peart Subject: [PATCH v1 1/4] correct typo/spelling error in t/README Thread-Topic: [PATCH v1 1/4] correct typo/spelling error in t/README Thread-Index: AQHUTDh0pwtCm1BX+0STPyIdHf9ddA== Date: Fri, 14 Sep 2018 14:37:26 +0000 Message-ID: <20180914143708.63024-2-benpeart@microsoft.com> References: <20180914143708.63024-1-benpeart@microsoft.com> In-Reply-To: <20180914143708.63024-1-benpeart@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [70.33.148.227] x-mailer: git-send-email 2.18.0.windows.1 x-clientproxiedby: CY4PR12CA0037.namprd12.prod.outlook.com (2603:10b6:903:129::23) To MW2PR2101MB0970.namprd21.prod.outlook.com (2603:10b6:302:4::19) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0972;6:YPuKuj952CTeYQQ5PpRkQ8pLf71VlYtiM4zgX4Fx1uxJgPa+7tDoY3CYgMzFGbOK2nVuvOU2zn73EdpRZA0kVuK3XVqqi7E1YBeXAtW/pebpdm0y57wxtj5DElz6mpGpeDGaM+Y0o430JD1aYaLZUy9lfiapU7S7Tp5wRcOuTOsnMlIRJIRvp+CITlLG0MDFMi1NR5aFM6G9jS2rYW+u92q0/uXgnhFiNCkAcZY+7uwuPE6SRCSvB+cOVOKZS8N4h1S/O9djP1VcQqCjsigY32prAlGC6VUpm8UA553vF3P4O+HR3LpuaMxtgtleo+aW9tLtQYVZ8zTBA0q7Rm4jcYp5artsvAq0gIg5sTtNhT6d/Fe0STsMsJcq3qYiCTF5cLw0w9TsLZN0lqNbJa4goEfQHA/F65YZLBRI9CWCl59Sd6IgYKa1KL707+16xVCDsgpTU5CTqV9NiwfSKANS0A==;5:dWuLxNljUEEq/E5vlaFf3nXKdyA9tROeY1Hwwr/zBG0AIAoSd1BNqyDgVnLn5QCIzj5mD6hWaUHEEh6tfcvhxdd8RrGQJu7tobfOtqPT5s35ZLaoeI+nvMX6E6TMYipAwZKuaEkC37J3tSynaot7bWOw4WOMFXZ2SAZBWu+MgV4=;7:Mscq4AEd73RkxufUz+ZEysSEPt6XQCbOokQfNRHihQi0g/hse+kOmZwni/x8Eip+BpxyICr18/k+/Ks+xEjhBh8mhByM7cBOd7KSXFMfG50Y2NMcoeq8uMcEYRZ6hx+uBttlfKwPHYQICQcdPb3NUbHgTJkBclhE63/eSx/LAw0qhZ3cs48nqKthP+kKvqYxgNgMTaJK165xNQTDc9j7G8VPSWIpa+cTXHI5xcFgGfT/BE24agR/Khtnuq8smHbC x-ms-office365-filtering-correlation-id: 98dfcfce-0d8e-4690-b3a3-08d61a4f96f9 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:MW2PR2101MB0972; x-ms-traffictypediagnostic: MW2PR2101MB0972: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231344)(944501410)(52105095)(2018427008)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB0972;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0972; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(136003)(396003)(346002)(376002)(199004)(189003)(486006)(6346003)(3846002)(386003)(22452003)(6506007)(6436002)(26005)(186003)(53936002)(2900100001)(2616005)(446003)(11346002)(5640700003)(5250100002)(6116002)(476003)(14454004)(76176011)(316002)(25786009)(54906003)(6486002)(10090500001)(36756003)(2501003)(99286004)(1076002)(6512007)(102836004)(97736004)(14444005)(52116002)(68736007)(66066001)(2351001)(106356001)(39060400002)(256004)(50226002)(8936002)(10290500003)(81166006)(81156014)(1730700003)(8676002)(107886003)(5660300001)(72206003)(478600001)(305945005)(6916009)(7736002)(2906002)(86612001)(4326008)(105586002);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0972;H:MW2PR2101MB0970.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; x-microsoft-antispam-message-info: bBe/pSNix03KR0OZy73OrOugUu566tvGqYxHrihAsi9jgMCi9T5MSQ2vuqfCQQRcZ/qh+Ldw849awoKqFAPVWES4U9N4eiBJzPLqHQms6q9fNNAvivbMe1k474C0eL5USQ5FZCiJhq2xPBZ5CXa1Uzv+jjBQWl81eiIj8vt3ml356cuPu3tDbuxYjzIBPoar0qI6a0zNmLLXig+67GUiGc6VbJMHk8OJBGS7LQ6HDDdGDC+g2iCdQpR3Z5WkiPWubEx0WM81UmU0awsp39p8H+MVVF3G77zwRJu1R1tO/sJGjuH6MMLGBBD8aRuOYZrY7ah95cCNeI/nui/IZ/3kePOu1Oh4ncpP1RiVRmLBFrg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 98dfcfce-0d8e-4690-b3a3-08d61a4f96f9 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 14:37:26.1095 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0972 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Correct a spelling error in the documentation for GIT_TEST_OE_DELTA_SIZE Signed-off-by: Ben Peart --- t/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/README b/t/README index 9028b47d92..56a417439c 100644 --- a/t/README +++ b/t/README @@ -315,7 +315,7 @@ packs on demand. This normally only happens when the object size is over 2GB. This variable forces the code path on any object larger than bytes. -GIT_TEST_OE_DELTA_SIZE= exercises the uncomon pack-objects code +GIT_TEST_OE_DELTA_SIZE= exercises the uncommon pack-objects code path where deltas larger than this limit require extra memory allocation for bookkeeping. From patchwork Fri Sep 14 14:37:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10600847 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 81B9714BD for ; Fri, 14 Sep 2018 14:37:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 63E4C2B82C for ; Fri, 14 Sep 2018 14:37:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 582482B837; Fri, 14 Sep 2018 14:37:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C04F62B82C for ; Fri, 14 Sep 2018 14:37:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728102AbeINTwb (ORCPT ); Fri, 14 Sep 2018 15:52:31 -0400 Received: from mail-by2nam03on0100.outbound.protection.outlook.com ([104.47.42.100]:51842 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727676AbeINTwa (ORCPT ); Fri, 14 Sep 2018 15:52:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=UqSv4pnwVCMnfhJ0sWXwfNavlHt+Z2pmblIZhQSMUk0=; b=i/lME44LNrTy7c40fwc8Gm2CIxJVh0NlaaIrU+DO9PBSWK7nhNURAR5pJIZNpdnSn7fv0CnT+qbVydkydudRRTsvsR5+mf3Ss+9tNBZJwY79WHfOBqN/MIMNjSsxAP1jILqBXMMpreM+fN8ucWSvP00yHtuqr28pr4oLLlKUpHo= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB0972.namprd21.prod.outlook.com (52.132.146.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.5; Fri, 14 Sep 2018 14:37:27 +0000 Received: from MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7]) by MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7%2]) with mapi id 15.20.1164.008; Fri, 14 Sep 2018 14:37:27 +0000 From: Ben Peart To: "git@vger.kernel.org" CC: "gitster@pobox.com" , "t.gummerer@gmail.com" , "avarab@gmail.com" , Ben Peart , Ben Peart Subject: [PATCH v1 2/4] fsmonitor: update GIT_TEST_FSMONITOR support Thread-Topic: [PATCH v1 2/4] fsmonitor: update GIT_TEST_FSMONITOR support Thread-Index: AQHUTDh1CxdAAq1L6E+Cf0697YGGGA== Date: Fri, 14 Sep 2018 14:37:27 +0000 Message-ID: <20180914143708.63024-3-benpeart@microsoft.com> References: <20180914143708.63024-1-benpeart@microsoft.com> In-Reply-To: <20180914143708.63024-1-benpeart@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [70.33.148.227] x-mailer: git-send-email 2.18.0.windows.1 x-clientproxiedby: CY4PR12CA0037.namprd12.prod.outlook.com (2603:10b6:903:129::23) To MW2PR2101MB0970.namprd21.prod.outlook.com (2603:10b6:302:4::19) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0972;6:Fsiq4PCsU5tPcPGPJJxpHWzC1STZOJMZwZPByoAGgKhLSjozmO1B/3dH36B3JbvQWaDA7neteOTcThfofhEcBkADCSrG1nsmWNw4pAQLiICydj/iCMlfAkZM3IspnLBIG92Tg+fdv72z2pJjfRM6V/6LffowoRFLtVdjxlAiwWWqe9MOgUzOIUKvdDmg6oCvlNSUoEWmaUjKTWZHGPWaaNwDttp8SsZruR2OA9mxR34RjRl4+qqXRWw5samVAGCmArntvcyLCyDuzI5jHkXO8feA00HUdAxC3Enufrr0qHFyytHTpOHETUwxKIWhnR77hsz28tl0ebYJk+61rJ3/h2XReR+l/Kj3tY96KzlgplZbpP8xt0/IeA+/subw7FFm3i/oHkYZqQhB7yHQJgJVLEPKEEvD2PxzRigVXweFkxMPMN8+n3gQSaGjKJU2Z4ad3coBh3NhSk03oS4fagVkHg==;5:zgv8a/fvXhD0GNdfVxBP2ZMIYNlL2IpY34nfCPNgMgeg9BLrt9gFl1uTs6PHRSNvVDKHjAYsFsFjDjbiLrO7mc799Ws/X+t0uxbgfyQpFQRkgroXHMFI4PqcL9rsF30+CuTpDKi+/CbttDR56BYKJo2pZhfX+KQ2zQfgy2uMwSs=;7:ibGcOaDXTPMxmtItDNT+L/cCf7hkUenRhQrxPqhg/LgaAQdymdMZqZmqvNLYjEtIHZ9vUUioTSIfp6IXG3JFncln3laeArBrPu0B8KNVzrg/NgZHSe+EuWRTacn5UVqAHB0Hea9blSjl+YzyqZsIsbkCAnkgPchzl0+mSSOXDGH9rAyH5031xHObuK5QGK31a6ttZGy5LDgkWgqkqgg42N+KhiWM2iGger8J2mWm+86ENoJOMKkIhHcy4v+5PA2M x-ms-office365-filtering-correlation-id: 29da5ebf-f7fd-4567-493b-08d61a4f97b1 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:MW2PR2101MB0972; x-ms-traffictypediagnostic: MW2PR2101MB0972: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231344)(944501410)(52105095)(2018427008)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB0972;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0972; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(136003)(396003)(346002)(376002)(199004)(189003)(486006)(6346003)(3846002)(386003)(22452003)(6506007)(6436002)(26005)(186003)(53936002)(2900100001)(2616005)(446003)(11346002)(5640700003)(5250100002)(6116002)(476003)(14454004)(76176011)(316002)(25786009)(54906003)(6486002)(10090500001)(36756003)(2501003)(99286004)(1076002)(6512007)(102836004)(97736004)(14444005)(52116002)(68736007)(66066001)(2351001)(106356001)(39060400002)(256004)(50226002)(8936002)(10290500003)(81166006)(81156014)(1730700003)(8676002)(107886003)(5660300001)(72206003)(478600001)(305945005)(6916009)(15650500001)(7736002)(2906002)(86612001)(575784001)(4326008)(105586002);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0972;H:MW2PR2101MB0970.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; x-microsoft-antispam-message-info: x/HMchpMuzG8hthtbZOA2QxgTqOC+6KrE9bveDRBvPCmvaKUtC04gS1XK+xNoKXZYk7B+x8o9LhDWme+QzXbfHXpmz5PKP11VDlzXXZBxWNk+T4iiOFCDpxc6vn4Tgys43Z9bKGpWZEi/jjY6t5flt/F1x4341dmrogcgloYk3+6vokqvZCxjcLPQlALQg/6Fyz4N+7Hmvl9mAg87etQBwi6gv4nByUxDJ/DbXIMdrCwBOs5ykMSoD3/hbdwfTVLfob3AZ9iTA0MyTycf3dWfTph9g40ICVGsTEAsp3nnTKvN6O6a/hHRrekYgW+3ihzMbmGsU6/doQSSxQj0rgYO4bECJOZ80QLp//IxHg6w3c= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 29da5ebf-f7fd-4567-493b-08d61a4f97b1 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 14:37:27.2501 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0972 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename GIT_FSMONITOR_TEST to GIT_TEST_FSMONITOR for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give an error when the old variable is set to let people know they need to update their environment to use the new variable. If the new variable is also set, just give a warning so they can eventually remove the old variable. Signed-off-by: Ben Peart --- config.c | 2 +- t/README | 4 ++++ t/t1700-split-index.sh | 2 +- t/t7519-status-fsmonitor.sh | 2 +- t/test-lib.sh | 11 +++++++++++ 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/config.c b/config.c index 3461993f0a..3555c63f28 100644 --- a/config.c +++ b/config.c @@ -2278,7 +2278,7 @@ int git_config_get_max_percent_split_change(void) int git_config_get_fsmonitor(void) { if (git_config_get_pathname("core.fsmonitor", &core_fsmonitor)) - core_fsmonitor = getenv("GIT_FSMONITOR_TEST"); + core_fsmonitor = getenv("GIT_TEST_FSMONITOR"); if (core_fsmonitor && !*core_fsmonitor) core_fsmonitor = NULL; diff --git a/t/README b/t/README index 56a417439c..47165f7eab 100644 --- a/t/README +++ b/t/README @@ -319,6 +319,10 @@ GIT_TEST_OE_DELTA_SIZE= exercises the uncommon pack-objects code path where deltas larger than this limit require extra memory allocation for bookkeeping. +GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor +code path for utilizing a file system monitor to speed up detecting +new or changed files. + Naming Tests ------------ diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index b3b4d83eaf..f6a856f24c 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.sh @@ -6,7 +6,7 @@ test_description='split index mode tests' # We need total control of index splitting here sane_unset GIT_TEST_SPLIT_INDEX -sane_unset GIT_FSMONITOR_TEST +sane_unset GIT_TEST_FSMONITOR test_expect_success 'enable split index' ' git config splitIndex.maxPercentChange 100 && diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index 756beb0d8e..d77012ea6d 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -8,7 +8,7 @@ test_description='git status with file system watcher' # To run the entire git test suite using fsmonitor: # # copy t/t7519/fsmonitor-all to a location in your path and then set -# GIT_FSMONITOR_TEST=fsmonitor-all and run your tests. +# GIT_TEST_FSMONITOR=fsmonitor-all and run your tests. # # Note, after "git reset --hard HEAD" no extensions exist other than 'TREE' diff --git a/t/test-lib.sh b/t/test-lib.sh index 44288cbb59..0ef111d808 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -140,6 +140,17 @@ then export GIT_INDEX_VERSION fi +if test -n "$GIT_FSMONITOR_TEST" +then + if test -n "$GIT_TEST_FSMONITOR" + then + echo "warning: the GIT_FSMONITOR_TEST variable has been renamed to GIT_TEST_FSMONITOR" + else + echo "error: the GIT_FSMONITOR_TEST variable has been renamed to GIT_TEST_FSMONITOR" + exit 1 + fi +fi + # Add libc MALLOC and MALLOC_PERTURB test # only if we are not executing the test with valgrind if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null || From patchwork Fri Sep 14 14:37:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10600849 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9F25D14BD for ; Fri, 14 Sep 2018 14:37:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F7982B832 for ; Fri, 14 Sep 2018 14:37:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7401E2B83E; Fri, 14 Sep 2018 14:37:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 023A62B832 for ; Fri, 14 Sep 2018 14:37:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728122AbeINTwd (ORCPT ); Fri, 14 Sep 2018 15:52:33 -0400 Received: from mail-by2nam03on0100.outbound.protection.outlook.com ([104.47.42.100]:51842 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726902AbeINTwb (ORCPT ); Fri, 14 Sep 2018 15:52:31 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=p2qG+Z+WRrzHW1nV2YCTjt+j2zQNaAlZQAg38F1YAso=; b=lfs2GFQK7hW9ooS785WaHjwRgehARomeJaoWMPamKgKEm4FCcyNj3Yb4trFcx/fjZ+dJIfsjtNBCx/b76DwP6slOw3n1nAZ8Z4nUXXGq2bw0jGUCYHawaGKFB72abvd9U/E9CjgLV1OGQI1kOI3MTxd0yg/93AmSIm5Nb6/+YQU= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB0972.namprd21.prod.outlook.com (52.132.146.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.5; Fri, 14 Sep 2018 14:37:28 +0000 Received: from MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7]) by MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7%2]) with mapi id 15.20.1164.008; Fri, 14 Sep 2018 14:37:28 +0000 From: Ben Peart To: "git@vger.kernel.org" CC: "gitster@pobox.com" , "t.gummerer@gmail.com" , "avarab@gmail.com" , Ben Peart , Ben Peart Subject: [PATCH v1 3/4] read-cache: update TEST_GIT_INDEX_VERSION support Thread-Topic: [PATCH v1 3/4] read-cache: update TEST_GIT_INDEX_VERSION support Thread-Index: AQHUTDh2CHVnD0bUhE+q1qB6eUTylQ== Date: Fri, 14 Sep 2018 14:37:28 +0000 Message-ID: <20180914143708.63024-4-benpeart@microsoft.com> References: <20180914143708.63024-1-benpeart@microsoft.com> In-Reply-To: <20180914143708.63024-1-benpeart@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [70.33.148.227] x-mailer: git-send-email 2.18.0.windows.1 x-clientproxiedby: CY4PR12CA0037.namprd12.prod.outlook.com (2603:10b6:903:129::23) To MW2PR2101MB0970.namprd21.prod.outlook.com (2603:10b6:302:4::19) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0972;6:8xGEnRJWGAAr5ulpjmTXqxSAZGBKF5Xjpl/BljUt8SwzmQsI870nk2KVwHdP+uAg889Z25Y9BunuOFumGCx/nSmI5meRgPdNktbBQusK8SjP3Nf1MxSPjBFwk60eT2K4Ec3ky2BRUSGS5hEQlTuenIKrjWYM4Ej9G58Zyo+BhqKpXhxajySCJSZjp3bHuB8jbOQxtv7M3J/K+YlbbFeOpB7Pl03WN0GZXKe7UcN9T30rDmXYj14fLIGCGB0YAXwEMpj44/r3LFCCXQw3Zbne9OhC8xoxOSx+RSgTv3cHk0d/fCs4yHYfSu+Y/V4O/8gUtu0KkjVWZkaCySPAO/lKiaKleGsKnHDYInwvpq6Efo36zpIgx0SdviNVf0ooHtsDRuaQEa6OGgDrzPMaq4FYg7WDDLc4I3UnotZ2Ke1D4h4IVOQkzeFstfZSJP5DDm1QlZzP/1zYfU0kes5ssaBcLg==;5:P/+a8qAo53LRHTRm4h5mhvctaDWJzbpxqTh7WWg3Vsbaewal0gHa8Xk2PuEFyu9ghg0/+tNjcBByj5WeERBv4OOaLF8PLMOcbchJuxdiU/AbuDKjFm8xYgg03/yog3FVUaRv5tA2yPEeuQ2VSz1Y/QDSDPh+4EC7kaJp5T33aCk=;7:GNnS0gso+3oHamoPGea6nHqF1Lql7dMCM+gQ6k+D6N4OsJ3ORIVwVFi0akYvPGDv5JnQFhvkl5p+XIt/Ni+AjmEHjuJW9T7lUyh2rxUek1D3OpAFIzBDLUZyIAes8sJSDj32ZhzaTF0MoSsi5cFmlpljazeqUcU2Krn5JCTJkLcPBOS0wOgPYKuKtfVhwFKkbJiInqEOissKZ6c7CRNSX3bbqynLV23vEZgk/PRYtYTt4k7rNiJH96T+7hRMP6mv x-ms-office365-filtering-correlation-id: 57ccd06e-d638-468a-1a4a-08d61a4f9864 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:MW2PR2101MB0972; x-ms-traffictypediagnostic: MW2PR2101MB0972: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231344)(944501410)(52105095)(2018427008)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB0972;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0972; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(136003)(396003)(346002)(376002)(199004)(189003)(486006)(6346003)(3846002)(386003)(22452003)(6506007)(6436002)(26005)(186003)(53936002)(2900100001)(2616005)(446003)(11346002)(5640700003)(5250100002)(6116002)(476003)(14454004)(76176011)(316002)(25786009)(54906003)(6486002)(10090500001)(36756003)(2501003)(99286004)(1076002)(6512007)(102836004)(97736004)(14444005)(52116002)(68736007)(66066001)(2351001)(106356001)(39060400002)(256004)(50226002)(8936002)(10290500003)(81166006)(81156014)(1730700003)(8676002)(107886003)(5660300001)(72206003)(478600001)(305945005)(6916009)(15650500001)(7736002)(2906002)(86612001)(575784001)(4326008)(105586002);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0972;H:MW2PR2101MB0970.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; x-microsoft-antispam-message-info: PafqA84q29BAusfbm3RFFX3ps+Fq+xkWR1+o3ghTaaKqDU6HXjv7z1oeyCep5k/oQd6/r8S9vnXnvVnAD8AX4br4S2SVAdlTuiJ/YE6YJLo2fZV/n7QLWDGDkhwei9mQFKNKAcs9V80iDCKJyePiVE1TA7/Cd5NTuk7+wjO8YyACVm6pCj3dZvGjl6oClcFw5t+dkOExbetN7pql0wGSVBwxnJ5jX74vBfT3nQUM2TCrjr6qMeweBwKHD2+4Y+vbaD28vfz7OopBe9flZmyv63gfgaKY20+1CEhrAOuuOxklQkPiv9wV6TJGxYTI+bedoGYclLJ/bWrYpNgrpQp5LT92pbgv+ngYa5CVi7r5FdQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57ccd06e-d638-468a-1a4a-08d61a4f9864 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 14:37:28.4064 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0972 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename TEST_GIT_INDEX_VERSION to GIT_TEST_INDEX_VERSION for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give an error when the old variable is set to let people know they need to update their environment to use the new variable. If the new variable is also set, just give a warning so they can eventually remove the old variable. Signed-off-by: Ben Peart --- Makefile | 6 +++--- t/README | 4 ++++ t/test-lib.sh | 15 +++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5a969f5830..9e84ef02f7 100644 --- a/Makefile +++ b/Makefile @@ -400,7 +400,7 @@ all:: # (defaults to "man") if you want to have a different default when # "git help" is called without a parameter specifying the format. # -# Define TEST_GIT_INDEX_VERSION to 2, 3 or 4 to run the test suite +# Define GIT_TEST_INDEX_VERSION to 2, 3 or 4 to run the test suite # with a different indexfile format version. If it isn't set the index # file format used is index-v[23]. # @@ -2599,8 +2599,8 @@ endif ifdef GIT_INTEROP_MAKE_OPTS @echo GIT_INTEROP_MAKE_OPTS=\''$(subst ','\'',$(subst ','\'',$(GIT_INTEROP_MAKE_OPTS)))'\' >>$@+ endif -ifdef TEST_GIT_INDEX_VERSION - @echo TEST_GIT_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(TEST_GIT_INDEX_VERSION)))'\' >>$@+ +ifdef GIT_TEST_INDEX_VERSION + @echo GIT_TEST_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_INDEX_VERSION)))'\' >>$@+ endif @if cmp $@+ $@ >/dev/null 2>&1; then $(RM) $@+; else mv $@+ $@; fi diff --git a/t/README b/t/README index 47165f7eab..9b13f6d12e 100644 --- a/t/README +++ b/t/README @@ -323,6 +323,10 @@ GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor code path for utilizing a file system monitor to speed up detecting new or changed files. +GIT_TEST_INDEX_VERSION= exercises the index read/write code path +for the index version specified. Can be set to any valid version +(currently 2, 3, or 4). + Naming Tests ------------ diff --git a/t/test-lib.sh b/t/test-lib.sh index 0ef111d808..5f5f0f4b55 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -134,12 +134,23 @@ export EDITOR GIT_TRACE_BARE=1 export GIT_TRACE_BARE -if test -n "${TEST_GIT_INDEX_VERSION:+isset}" +if test -n "${GIT_TEST_INDEX_VERSION:+isset}" then - GIT_INDEX_VERSION="$TEST_GIT_INDEX_VERSION" + GIT_INDEX_VERSION="$GIT_TEST_INDEX_VERSION" export GIT_INDEX_VERSION fi +if test -n "$TEST_GIT_INDEX_VERSION" +then + if test -n "$GIT_TEST_INDEX_VERSION" + then + echo "warning: the TEST_GIT_INDEX_VERSION variable has been renamed to GIT_TEST_INDEX_VERSION" + else + echo "error: the TEST_GIT_INDEX_VERSION variable has been renamed to GIT_TEST_INDEX_VERSION" + exit 1 + fi +fi + if test -n "$GIT_FSMONITOR_TEST" then if test -n "$GIT_TEST_FSMONITOR" From patchwork Fri Sep 14 14:37:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10600851 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 94B90933 for ; Fri, 14 Sep 2018 14:37:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 767142B837 for ; Fri, 14 Sep 2018 14:37:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A36E2B841; Fri, 14 Sep 2018 14:37:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECD502B837 for ; Fri, 14 Sep 2018 14:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728132AbeINTwe (ORCPT ); Fri, 14 Sep 2018 15:52:34 -0400 Received: from mail-by2nam03on0100.outbound.protection.outlook.com ([104.47.42.100]:51842 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727676AbeINTwe (ORCPT ); Fri, 14 Sep 2018 15:52:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WXjbn/Ym33hZLTd8JHv374hNi2J0w2w4MorIWUux52s=; b=Wqc0qiFGksd4aPb3R5NXPCDhLNKOdG0RWqg315QO2Y3MJce0Dz7kkY+DDlbwO8WKFMV1fBWaqHrDHnvj7ouccGEppv4SbyDfGhmtzTkAVbGcvhmnA18VjUOM/1OuS0reA1fRrMNqDlKjjIDOVi22Yn/BB8E1yDCLVcdYL/Xb4bY= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB0972.namprd21.prod.outlook.com (52.132.146.21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.5; Fri, 14 Sep 2018 14:37:29 +0000 Received: from MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7]) by MW2PR2101MB0970.namprd21.prod.outlook.com ([fe80::3c7b:f2aa:d871:8ae7%2]) with mapi id 15.20.1164.008; Fri, 14 Sep 2018 14:37:29 +0000 From: Ben Peart To: "git@vger.kernel.org" CC: "gitster@pobox.com" , "t.gummerer@gmail.com" , "avarab@gmail.com" , Ben Peart , Ben Peart Subject: [PATCH v1 4/4] preload-index: update GIT_FORCE_PRELOAD_TEST support Thread-Topic: [PATCH v1 4/4] preload-index: update GIT_FORCE_PRELOAD_TEST support Thread-Index: AQHUTDh2RxdElgyF/UW00bwXjPlkZQ== Date: Fri, 14 Sep 2018 14:37:29 +0000 Message-ID: <20180914143708.63024-5-benpeart@microsoft.com> References: <20180914143708.63024-1-benpeart@microsoft.com> In-Reply-To: <20180914143708.63024-1-benpeart@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [70.33.148.227] x-mailer: git-send-email 2.18.0.windows.1 x-clientproxiedby: CY4PR12CA0037.namprd12.prod.outlook.com (2603:10b6:903:129::23) To MW2PR2101MB0970.namprd21.prod.outlook.com (2603:10b6:302:4::19) x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB0972;6:KZlkMaozQuK8k/yn6TuWOmN1MRphtZvK7RvGHUJWdYom7C3YVL0832iwDhpKB5jGQSvnVQk5q62ScrgThmUTztC2mcKMWF+h27IKVWjZQesH/P5LUJsQjcu3ibdMZXrbL6jb1FYuKdseou39Donih1n7Te7l+9KS+pV62cRgMMP2XIm59HNP0hp4r82gy6VejrTu/ldS7BCND2h9Ub2yMsrBJD+RYorudNhbxEWEb+mYDKOx0S2He9PfebzjROL8exvia8x3YAR3TZ785pq2yfuXt4Qh7HR0EnRoMnj3xquD/6/O3eFcbImj65R5VwVKrm4a3F/zpDfQPwxnsMZPegPzDB5tMdz447SO/ba4EOKwmWHwIJODn8P8E8mgVeXYgPCsr9pM3IFxsBOTKPfkq0UJ1LrRHABGUE7Zxys2bXsPtTsheq5y01nAoc1Bnkkf+9fe1IkOoRPK9VMIrnQ08w==;5:hqENpJKAdeEOKFTinDfhu6Ey8BHLRra7qYN/75DS7c3a5TTqreN1OhzUI4csWhW9AwyHXFh9rIhhzLQywbZJbSbS1z4UWLZiuIKTgrsD6rRkOZqsF5dNiD7sueesHH5Zxb++0PYRGfL22mgg6FES1HnOtZErgiVyVT5etxAA0rw=;7:K2mljzfe2f+bKV6M35aQShFOGX9PT9+/zPv9bDpm5fyoDcfIOhsoqOg7r6jEXtDrRXTVvgfQJ8oB0kq0H3Cv+GErRwx9YROEecSXsT/byZFNkPaIt0lBYF7N2HHZyJIB+5z2Juj634RTlaqewgDJ1GsiC8wzC9sSlfzqoLItTuYOnxamFEfF6tfZLXbcL5JN722s5CpjcFA3eDysQzJhvD+JSSs8wx/D5ylIXNWIqHlsy0LmXQq2tMZsibcy+sux x-ms-office365-filtering-correlation-id: 40194c3a-fcac-4e0e-eb50-08d61a4f9916 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7193020);SRVR:MW2PR2101MB0972; x-ms-traffictypediagnostic: MW2PR2101MB0972: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231344)(944501410)(52105095)(2018427008)(10201501046)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123564045)(20161123562045)(20161123558120)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB0972;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB0972; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(39860400002)(366004)(136003)(396003)(346002)(376002)(199004)(189003)(486006)(6346003)(3846002)(386003)(22452003)(6506007)(6436002)(26005)(186003)(53936002)(2900100001)(2616005)(446003)(11346002)(5640700003)(5250100002)(6116002)(476003)(14454004)(76176011)(316002)(25786009)(54906003)(6486002)(10090500001)(36756003)(2501003)(99286004)(1076002)(6512007)(102836004)(97736004)(14444005)(52116002)(68736007)(66066001)(2351001)(106356001)(39060400002)(256004)(50226002)(8936002)(10290500003)(81166006)(81156014)(1730700003)(8676002)(107886003)(5660300001)(72206003)(478600001)(305945005)(6916009)(15650500001)(7736002)(2906002)(86612001)(575784001)(4326008)(105586002);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB0972;H:MW2PR2101MB0970.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; x-microsoft-antispam-message-info: jk85rbHE7Wt94DOKRlkPUsF4fRfrCag4tbJ2MSCPH5WqL2jPqGuZBw2DRX9PFW8EIQwp67aSD6U1tu5nYapYccpUoBpBb7oy+XFiD4UO0swQZ1QNgxcPSVOer1xpJoTWmgvwtxuLRwSJyXFOLZo6S8joRJj+Wo52L3HqWmUfdiA8HVo1GIEom9an5afHB6hj4aHfyDeti3jBT3PO5PDbser7A2qG7bUqZlJKhgeQHf0VNTm7zbZjIXHKkfIYa8QdrhO91Um/ICcJod7urpyEFPtNWUe2HgrlPMX3dQL882kATmP9aO4bTUjpVoZFeeLn3nexinn3IJd2kg/uzmRzVgZjcDTJKq3/qreJhFKP+6s= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40194c3a-fcac-4e0e-eb50-08d61a4f9916 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 14:37:29.5783 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB0972 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Rename GIT_FORCE_PRELOAD_TEST to GIT_TEST_PRELOAD_INDEX for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give an error when the old variable is set to let people know they need to update their environment to use the new variable. If the new variable is also set, just give a warning so they can eventually remove the old variable. Signed-off-by: Ben Peart --- preload-index.c | 3 ++- t/README | 3 +++ t/t7519-status-fsmonitor.sh | 4 ++-- t/test-lib.sh | 11 +++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/preload-index.c b/preload-index.c index 71cd2437a3..a850e197c2 100644 --- a/preload-index.c +++ b/preload-index.c @@ -5,6 +5,7 @@ #include "pathspec.h" #include "dir.h" #include "fsmonitor.h" +#include "config.h" #ifdef NO_PTHREADS static void preload_index(struct index_state *index, @@ -84,7 +85,7 @@ static void preload_index(struct index_state *index, return; threads = index->cache_nr / THREAD_COST; - if ((index->cache_nr > 1) && (threads < 2) && getenv("GIT_FORCE_PRELOAD_TEST")) + if ((index->cache_nr > 1) && (threads < 2) && git_env_bool("GIT_TEST_PRELOAD_INDEX", 0)) threads = 2; if (threads < 2) return; diff --git a/t/README b/t/README index 9b13f6d12e..5670c7aad0 100644 --- a/t/README +++ b/t/README @@ -327,6 +327,9 @@ GIT_TEST_INDEX_VERSION= exercises the index read/write code path for the index version specified. Can be set to any valid version (currently 2, 3, or 4). +GIT_TEST_PRELOAD_INDEX= exercises the preload-index code path +by overriding the minimum number of cache entries required per thread. + Naming Tests ------------ diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh index d77012ea6d..8308d6d5b1 100755 --- a/t/t7519-status-fsmonitor.sh +++ b/t/t7519-status-fsmonitor.sh @@ -245,9 +245,9 @@ do git config core.preloadIndex $preload_val && if test $preload_val = true then - GIT_FORCE_PRELOAD_TEST=$preload_val; export GIT_FORCE_PRELOAD_TEST + GIT_TEST_PRELOAD_INDEX=$preload_val; export GIT_TEST_PRELOAD_INDEX else - unset GIT_FORCE_PRELOAD_TEST + sane_unset GIT_TEST_PRELOAD_INDEX fi ' diff --git a/t/test-lib.sh b/t/test-lib.sh index 5f5f0f4b55..3f447b8ddc 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -162,6 +162,17 @@ then fi fi +if test -n "$GIT_FORCE_PRELOAD_TEST" +then + if test -n "$GIT_TEST_PRELOAD_INDEX" + then + echo "warning: the GIT_FORCE_PRELOAD_TEST variable has been renamed to GIT_TEST_PRELOAD_INDEX" + else + echo "error: the GIT_FORCE_PRELOAD_TEST variable has been renamed to GIT_TEST_PRELOAD_INDEX" + exit 1 + fi +fi + # Add libc MALLOC and MALLOC_PERTURB test # only if we are not executing the test with valgrind if expr " $GIT_TEST_OPTS " : ".* --valgrind " >/dev/null ||