From patchwork Fri Sep 14 20:13:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10601201 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 87959933 for ; Fri, 14 Sep 2018 20:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 728A02BD16 for ; Fri, 14 Sep 2018 20:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 669E22BD27; Fri, 14 Sep 2018 20:14:07 +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 B3FAB2BD28 for ; Fri, 14 Sep 2018 20:14:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728111AbeIOBaD (ORCPT ); Fri, 14 Sep 2018 21:30:03 -0400 Received: from mail-sn1nam02on0110.outbound.protection.outlook.com ([104.47.36.110]:25600 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728045AbeIOBaD (ORCPT ); Fri, 14 Sep 2018 21:30:03 -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=d99est2tjP0rZnj2uCWEq6cAlzsEcfwAD1VpX6lxOQoBVNY6sDPBIzi7qnNGYswkSqjk/4hwsczOzCHeQmqNlKou8WwFITPvhYcJQ4F7yY1zniCwgkRNJ84PJZeQv9kODD2oMyukNG9rXCgjOZiDurCsho+bnIdUoHCQloSiqhA= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB1083.namprd21.prod.outlook.com (52.132.149.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.13; Fri, 14 Sep 2018 20:13:59 +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 20:13:59 +0000 From: Ben Peart To: "peartben@gmail.com" CC: Ben Peart , "avarab@gmail.com" , Ben Peart , "git@vger.kernel.org" , "gitster@pobox.com" , "t.gummerer@gmail.com" Subject: [PATCH v2 1/5] correct typo/spelling error in t/README Thread-Topic: [PATCH v2 1/5] correct typo/spelling error in t/README Thread-Index: AQHUTGd4J12X6HH+hUyYAJ2h0injsw== Date: Fri, 14 Sep 2018 20:13:59 +0000 Message-ID: <20180914201340.37400-2-benpeart@microsoft.com> References: <80988727-085f-cdd9-e5bb-a90a55e97024@gmail.com> <20180914201340.37400-1-benpeart@microsoft.com> In-Reply-To: <20180914201340.37400-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: CY1PR07CA0019.namprd07.prod.outlook.com (2a01:111:e400:c60a::29) 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;MW2PR2101MB1083;6:GeFuT3gZKS1ak63OOqsi8ItsMdDz1AGojofK76Lk5fu9Vmx6CZOTaHwLGZ8K03lRefW/oo37g1yW8vfk7yEquCR9+kaB69mvxNtizGm0mEIITVARjkJiRyEN+cADziA5tKV90U7v2QTxaFzdkZ90Op5A/dzTBDi4w4sWngkADeAdDb7Prh3Ylp1dw5j0v91gz6HUssV35oEoH6uF5tcvoIunPfOeaKEgC1e/3Byx+HgfF/m0RqAOGewQj0anCOczrpfjdabPpe5FG7PDa4ppiELEabDgsS/0s+PkV/9FKGcMFNIs1m6RcMSASeE1+mLU+x/+ZGIN2tS5B5HQryMaSkdnMkqOTPFjNaeDIod0pvcw6u+XcaLmnsi6JoO2294wHD+YgJEE35eo15A/gNdoLe70NFteJLAwALRWqM/pVSPECLR8Td2rMtzHfpeUDK4XzjacdRIOaEZvZmplvp79CA==;5:ToZNPjNBJBUgPPxLRZCSI93cbgecZvNEtHcCUAfbtBrQmaV4gjlpiF13GRceF2EtNAjZwLBmzUN9DPqs1Es7mxFs/DA5wopcSfKvTSC5VC7qNqT/6JVsVkSf9uV1+kvGCjKtWHuEwR/lscpIVCTOuzP/YTOhvceGVzaw8xFV7Jg=;7:zAsf2dPJyWqHuXilDUSHgQarNfQcdX7FlmqpMJHWsBv1ak4mnxJI6LADfM4/mHlfKxftgasSvjbPhdFNFQTqYVmDeRqy6czEjSXcTYqgTHyHFJcSDNYtDaASYnBOuO0onmxMZ2IX6pyyWKcdCVN+5qYGdJ1zvEg6BH2g19Egbk97rn/gXNt3QamRmUzA8pwUCuvXiApjqR1Kx3UibeCN0VLcUQbTVv8u6uRv9WmaAHUBmCRtUHvvNtS5g9Sw5wIB x-ms-office365-filtering-correlation-id: 2bb95a74-f52b-4158-a376-08d61a7e9aec 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:MW2PR2101MB1083; x-ms-traffictypediagnostic: MW2PR2101MB1083: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; 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)(5005006)(8121501046)(3002001)(3231344)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB1083;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1083; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(136003)(396003)(376002)(39860400002)(366004)(346002)(199004)(189003)(54906003)(478600001)(36756003)(2351001)(81166006)(81156014)(386003)(1730700003)(6506007)(8676002)(4326008)(316002)(8936002)(97736004)(22452003)(102836004)(1076002)(6116002)(3846002)(106356001)(1361003)(72206003)(25786009)(50226002)(105586002)(305945005)(14454004)(7736002)(1411001)(99286004)(86612001)(2906002)(76176011)(52116002)(10290500003)(5660300001)(6916009)(39060400002)(5250100002)(6512007)(486006)(186003)(6436002)(11346002)(476003)(2616005)(6486002)(446003)(26005)(5640700003)(2900100001)(10090500001)(2501003)(66066001)(53936002)(68736007)(14444005)(256004);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1083;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) x-microsoft-antispam-message-info: wtDOWfR5S37Vi+MismQ6XFphENgCjjmrPOQR8e8AHJxwoIn5wqRgTRfHa8VdsJ+mSURczOxDslT3jdFE2X8qOpA7rNrQxpWxGpvS/RAINYS0u5NdgHrrxAKdurheczktW540mxcuGKo+LLjtodBheONCCvESghd5ZM096oap23SvXjKu8ETycJGnz37UzDcDcCO1+aD6OWI/ZepyAlEtdSA1CW8J78TCh/cbmAru1fTw4+4sTz4QvAr1j5imoiAg0wwQfuC9JUxvFsfBLFXIAib/bHx5S4gNXz5drM7B8g8op/ufP81u77n8GeTRzu1L6sRm30hk3H9YA8SuXsFHaSzP7blv6spozNgwdevdV7k= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2bb95a74-f52b-4158-a376-08d61a7e9aec X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 20:13:59.5342 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083 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 Reviewed-by: Jonathan Nieder --- 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 20:14:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10601199 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 509EB14DB for ; Fri, 14 Sep 2018 20:14:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3AA102BD16 for ; Fri, 14 Sep 2018 20:14:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EA562BD30; Fri, 14 Sep 2018 20:14:07 +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 CC22B2BD16 for ; Fri, 14 Sep 2018 20:14:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728132AbeIOBaE (ORCPT ); Fri, 14 Sep 2018 21:30:04 -0400 Received: from mail-sn1nam02on0110.outbound.protection.outlook.com ([104.47.36.110]:25600 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726969AbeIOBaE (ORCPT ); Fri, 14 Sep 2018 21:30:04 -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=buVBrNEGVJ1ejPnwXPjvBvi+zgjlL3vypayHal3KR4o=; b=Z0fHYPPM+3hgKN1spjXoQz02G2Hrq18pHRm6MVnwdxO0ScKkulKS6FkAfXxSTKGDx5FY9qbMGG47na83WtSsE7wJZFXvqdnIeBB0EALNK94z67GWRAB48H9xAS8AbGC2F25r85+PFpIDMPv6n8b14epLECFCAX1h14SipCiRVvQ= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB1083.namprd21.prod.outlook.com (52.132.149.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.13; Fri, 14 Sep 2018 20:14:01 +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 20:14:01 +0000 From: Ben Peart To: "peartben@gmail.com" CC: Ben Peart , "avarab@gmail.com" , Ben Peart , "git@vger.kernel.org" , "gitster@pobox.com" , "t.gummerer@gmail.com" Subject: [PATCH v2 2/5] preload-index: teach GIT_FORCE_PRELOAD_TEST to take a boolean Thread-Topic: [PATCH v2 2/5] preload-index: teach GIT_FORCE_PRELOAD_TEST to take a boolean Thread-Index: AQHUTGd5Hr3vQtUps02druf/BL7ikw== Date: Fri, 14 Sep 2018 20:14:01 +0000 Message-ID: <20180914201340.37400-3-benpeart@microsoft.com> References: <80988727-085f-cdd9-e5bb-a90a55e97024@gmail.com> <20180914201340.37400-1-benpeart@microsoft.com> In-Reply-To: <20180914201340.37400-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: CY1PR07CA0019.namprd07.prod.outlook.com (2a01:111:e400:c60a::29) 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;MW2PR2101MB1083;6:y38ACaYmgwErdmyRcmqJZyO8cbXxQoJ72uzkH/Nh0QQN0D8gQgerVG0eDHGQhws1S/nBuZ7wOmSbfHX2fj3EByjNT/RDlDLHNmqgPjdh6+5vr0c2VzRDNh8CYS94hufCecmh5vFX73sTo4Cd4M7r3TD3rauYwOMGJ/yLVLpZSnOMYz4wR0hY6AKdhTU22Tn8pBQiXLtozumNLNSxg/muJD4HX7yPxHA8fmpMdETZ3llLU3ocr1QHF4iZCZ/0bvGvI2U5EHZ3QRzeurPhDKEKO7OVsyVQS6eC1+WctBdmjRd6Vbp1pCAXkRe3toBMivJa7u30as/dL5mJvk0p4zL28SqMlPn0wRlL1BO1uo02HWhu/8s477aOCUthoMxD5+gP1efTv7r8Q+7KCFLxEyRKIae4ekzzZng21FsoiNZ+4rW9JcbC+/rfdjznf0so1sU5Go65aqJl/fljOli6ma37+A==;5:W3TFRxmFbVepo9qzg9GuozKHsUSC2+/a3rieNtiVRFgjg3vHg5YNE3da21Z+sX2ZKZur7WgJ1aI2inE6kiUg00HUKFSFcXMtnfdBSRUtCgU1CEnLPwS3HEZMFaAi9RNEc0xyu9+/nKPCEVqyfbANRg0PzC5dx83Fl0of/QUvfnY=;7:SdzhdFt/c/UcURJfscIbO+5uaaqov2v7UMvEjeiTv+KQ5uJpRelYaJr0oMheiqgHW7nX44eFfoAe2gaTRXmwEhHTD+yisvX0/km7H1oObkKSZe7Fl/ic3c33H/ISJOLKbOUN0WWbOy4o0EZZtmwPVsWZy2h0yoovzpkL9Lu3DW7qPwdAWAxKp1Xo6Sn7grfnqwkAd4tAFPK/tYdfWLeOx3gONvhkF29mAekeZQZV+1Q0Htr7cb9dCaas23JyoaTc x-ms-office365-filtering-correlation-id: 9eaf7941-ac9c-443e-f79c-08d61a7e9c24 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:MW2PR2101MB1083; x-ms-traffictypediagnostic: MW2PR2101MB1083: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; 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)(5005006)(8121501046)(3002001)(3231344)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB1083;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1083; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(979002)(136003)(396003)(376002)(39860400002)(366004)(346002)(199004)(189003)(54906003)(478600001)(36756003)(2351001)(81166006)(81156014)(386003)(1730700003)(6506007)(8676002)(4326008)(316002)(8936002)(97736004)(22452003)(102836004)(1076002)(6116002)(3846002)(106356001)(1361003)(72206003)(25786009)(50226002)(105586002)(305945005)(14454004)(7736002)(1411001)(99286004)(86612001)(2906002)(76176011)(52116002)(10290500003)(5660300001)(6916009)(39060400002)(5250100002)(6512007)(486006)(186003)(6436002)(11346002)(476003)(2616005)(6486002)(446003)(26005)(5640700003)(2900100001)(10090500001)(2501003)(66066001)(53936002)(68736007)(14444005)(256004)(969003)(989001)(999001)(1009001)(1019001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1083;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) x-microsoft-antispam-message-info: Y0C7Uy8snmayzjYPVp9IzxqoqjVHlODwYeZq4E7Lo7yCUrtojh5cEzaEG2MGlDRWN+xRuVyWcNn2ByEbXz5uqlJXSKqLPAApx2eZ9aUliWSnv4Sv7L8LnW0Ii8/XRXb0dkPZQYtZSNHmvSp1EwJXYX8iW4WY9NdCiSti30CYtRiGjWXplIA/NkyaeEfGvfq0kk/f7eeI6+q5GkamC4aRdCXFxSV1UdqpkpQCQiRKXczW24GyIUyVd+sCI/ZyJuCt2WOxnGpCeg50SR2hsc1MDexykIbacnyMLMR9672/ZgFQx2sV3pi7EzsQZxRhhg7YZgZbS9NGaY5VFiYlaTxgSIoErJbd7cLLdRThtw0PeXU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9eaf7941-ac9c-443e-f79c-08d61a7e9c24 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 20:14:01.2686 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Teach GIT_FORCE_PRELOAD_TEST to take a boolean to turn on or off this test feature instead of simply testing for existance. Signed-off-by: Ben Peart --- preload-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/preload-index.c b/preload-index.c index 71cd2437a3..0a4e2933bb 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_FORCE_PRELOAD_TEST", 0)) threads = 2; if (threads < 2) return; From patchwork Fri Sep 14 20:14:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10601203 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 C566B14DB for ; Fri, 14 Sep 2018 20:14:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AE16C2BD16 for ; Fri, 14 Sep 2018 20:14:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A1EC62BD28; Fri, 14 Sep 2018 20:14:10 +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 2A87E2BD16 for ; Fri, 14 Sep 2018 20:14:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728154AbeIOBaJ (ORCPT ); Fri, 14 Sep 2018 21:30:09 -0400 Received: from mail-sn1nam02on0110.outbound.protection.outlook.com ([104.47.36.110]:25600 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728045AbeIOBaJ (ORCPT ); Fri, 14 Sep 2018 21:30:09 -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=pBPv0x7qpFIjCywICJvI2lmeTtqGYm7nMVlfVZVAxI0=; b=iEYAH1uDxGOkHbzdVbY59DKbpszofdP4JANYboclHAnkFKHZwL//cqP3XWAR4vhFuE674pHCg6F+Zpq/eRtLjDmBm8AWJm8Ni9OZPMEd6UR16YxAfb2NHNFfiJFD9cYBoXD1WkDZ1EmYOwQE90Gyqgp0q3uRd5NfN0Fzstb30dU= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB1083.namprd21.prod.outlook.com (52.132.149.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.13; Fri, 14 Sep 2018 20:14:02 +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 20:14:02 +0000 From: Ben Peart To: "peartben@gmail.com" CC: Ben Peart , "avarab@gmail.com" , Ben Peart , "git@vger.kernel.org" , "gitster@pobox.com" , "t.gummerer@gmail.com" Subject: [PATCH v2 3/5] fsmonitor: update GIT_TEST_FSMONITOR support Thread-Topic: [PATCH v2 3/5] fsmonitor: update GIT_TEST_FSMONITOR support Thread-Index: AQHUTGd644xDfWaU4U67smCy4q78mA== Date: Fri, 14 Sep 2018 20:14:02 +0000 Message-ID: <20180914201340.37400-4-benpeart@microsoft.com> References: <80988727-085f-cdd9-e5bb-a90a55e97024@gmail.com> <20180914201340.37400-1-benpeart@microsoft.com> In-Reply-To: <20180914201340.37400-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: CY1PR07CA0019.namprd07.prod.outlook.com (2a01:111:e400:c60a::29) 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;MW2PR2101MB1083;6:nEkhH6LNcMGbzMYZ+lhuqv3XiXGt+yk6izb+Con5YyC4ibsMU4sVyaVPb4oV3cHHVlmePWrbNBKZ3qWzDJWbKpJk40WgCq0vrkbwMzZaMlwX0XwQAGkrDcBkg1eYFo/L35QNvMo5bWznEn7o8jyWqnDJ1ZadTW9nSLHNAm8e75PEPZB/CQWEzrDaB5zjwg9FsacVBtZcwHSEHuSvhBIhoQ5pteh4MsZdfST5xFSh4sqJMwBAV3zNio4mePqKTWGXauUQEmPXT7Ntpwy1GNH4pS8yXKl5cmRJ+rjhjWkXUhnXKmHXkmkWmqF0zQgcsbSMrB8wBNUMdAdEv0mxCjJ9bRHhOFyZODDRs2UR8WLdRUIMIPMlv+5h/0L4Rwbc88uRvWhSvlIjreuo0QFChzCLaVYvXYxSCGxzDIkZCWGo2cgfmVu+D/NRhFxzo0s/JY5Avkr/ixIP7zxhHrFHV3G1+w==;5:hoJKpv8H/tUX7y/2tetfbQyNbmAbSLO8PiANZkdmhXbHApWw6CFv1cNOnI+7D8RdEn54zoW9UgnvUl89IYKc3BtPEIjdnxSG2fX9tr2KEg5hOPTkJzEmjp+NWJT3E5PCegt3TKyHqPsG7+p05urmpw7E8XMMvMMkRGT1mPFilvg=;7:cqrQd0lcr8xx13LbPhWXxEq/N3KSec5zg4I/jdb9ivQGU8nS9iBjjkv436uN+uhFUdZNMfCOf1nso+pFzL8ehQ6vw9y1IFpEhxKD8EzGmxmgbkB+mypfnxjxGOefxSd6dP3H8wrA09G6O5OvKnE0BGtnC+Qd9JsHr76lwYmyXPSDGhmKTHebVlIo1Ar51q6QU8LeYpt3a5LuO5VF7Lllx4Mq3JNjtnHhlHk2eS7P8LUtCNZqvG4bunCIbeHb/h9Y x-ms-office365-filtering-correlation-id: 689b08ab-0384-4c69-2901-08d61a7e9cf9 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:MW2PR2101MB1083; x-ms-traffictypediagnostic: MW2PR2101MB1083: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; 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)(5005006)(8121501046)(3002001)(3231344)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB1083;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1083; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(136003)(396003)(376002)(39860400002)(366004)(346002)(199004)(189003)(54906003)(478600001)(36756003)(2351001)(81166006)(81156014)(386003)(1730700003)(6506007)(8676002)(4326008)(316002)(8936002)(97736004)(22452003)(102836004)(1076002)(6116002)(3846002)(106356001)(1361003)(72206003)(575784001)(25786009)(50226002)(105586002)(305945005)(14454004)(7736002)(1411001)(99286004)(86612001)(2906002)(15650500001)(76176011)(52116002)(10290500003)(5660300001)(6916009)(39060400002)(5250100002)(6512007)(486006)(186003)(6436002)(11346002)(476003)(2616005)(6486002)(446003)(26005)(5640700003)(2900100001)(10090500001)(2501003)(66066001)(53936002)(68736007)(14444005)(256004);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1083;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) x-microsoft-antispam-message-info: Zeq2KG0S0UTYnLlynpdv6STPKSox/QjDMmO8tk7Pr3kQTtflAMr69Zss7XLIkZZSLllISaC8SnaovKlhl7mkeYqPSFoULr5VaniT6s0EwraFAAcTeA3m24QV/Nu94bggA8ImlHsiKx1UbR3nPldGv4TrGcbHbdCXjkXaw4ZfZUJDZx7e9pYnqDEZZ9PhBEUFNE7ZJRIK+hdIzRYaxW5Au5BkWQmirqOKkUNfdAO3mjMO43YYDoBFX851dkw3MXQaZTqadM3D9lOIxsfGn+unLp0g+rjiq6izKkqRnMW5hvHC6ozUCN/A7nTiwoRpATxU3V7u327CSdOqe0qZle6q5HZsHwZMCF0QvR2lxuOFiWQ= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 689b08ab-0384-4c69-2901-08d61a7e9cf9 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 20:14:02.5498 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083 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 a warning when the old variable is set to let people know they need to update their environment to use the new 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 | 20 ++++++++++++++++++++ 5 files changed, 27 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..653688c067 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -140,6 +140,26 @@ then export GIT_INDEX_VERSION fi +check_var_migration () { + old_name=$1 new_name=$2 + eval "old_isset=\${${old_name}:+isset}" + eval "new_isset=\${${new_name}:+isset}" + case "$old_isset,$new_isset" in + isset,) + echo >&2 "warning: $old_name is now $new_name" + echo >&2 "hint: set $new_name too during the transition period" + eval "$new_name=\$$old_name" + ;; + isset,isset) + # do this later + # echo >&2 "warning: $old_name is now $new_name" + # echo >&2 "hint: remove $old_name" + ;; + esac +} + +check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR + # 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 20:14:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10601205 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 D6F1C14DB for ; Fri, 14 Sep 2018 20:14:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C03102BD16 for ; Fri, 14 Sep 2018 20:14:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B437E2BD28; Fri, 14 Sep 2018 20:14:12 +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 46F1C2BD16 for ; Fri, 14 Sep 2018 20:14:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728162AbeIOBaL (ORCPT ); Fri, 14 Sep 2018 21:30:11 -0400 Received: from mail-sn1nam02on0110.outbound.protection.outlook.com ([104.47.36.110]:25600 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726969AbeIOBaK (ORCPT ); Fri, 14 Sep 2018 21:30:10 -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=bPNsWhYUgu8RnWJoBJGtDPvxf0XRfyZXnceIUerUf58=; b=NJ2yWEKqikGa9c045XlJ2Kq4CAnuJJgEl5q0WtHRWvOB5t80mYTBIfVMnmV8tomLXnaKvqePpYOPDrgZZVs5WIQDkMGLIDCOXkuJ4xOjzHpklK2YX0GmkXe/Dg7VNdVwzj4nMMeCPGFw4EpJNQOkR7XpBv0D49wi1dXL0JwnU2s= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB1083.namprd21.prod.outlook.com (52.132.149.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.13; Fri, 14 Sep 2018 20:14:03 +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 20:14:03 +0000 From: Ben Peart To: "peartben@gmail.com" CC: Ben Peart , "avarab@gmail.com" , Ben Peart , "git@vger.kernel.org" , "gitster@pobox.com" , "t.gummerer@gmail.com" Subject: [PATCH v2 4/5] read-cache: update TEST_GIT_INDEX_VERSION support Thread-Topic: [PATCH v2 4/5] read-cache: update TEST_GIT_INDEX_VERSION support Thread-Index: AQHUTGd7ZiZOlAjVQUSnyC2pf0z3nw== Date: Fri, 14 Sep 2018 20:14:03 +0000 Message-ID: <20180914201340.37400-5-benpeart@microsoft.com> References: <80988727-085f-cdd9-e5bb-a90a55e97024@gmail.com> <20180914201340.37400-1-benpeart@microsoft.com> In-Reply-To: <20180914201340.37400-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: CY1PR07CA0019.namprd07.prod.outlook.com (2a01:111:e400:c60a::29) 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;MW2PR2101MB1083;6:SdJe1P0QUg3KnCUrp0aQgXgQn32/PNqXbZcXYvj6kAgt5rMwSrEDCPJnCJEbRZHq2FY2Pn9ZsZ3D3j6xq0NJi4/cVGhLPkHEVAqMzoGhAtNZJPr9UlEieA7wXbjZ6iFrj6ooer37qvFLfwum0uO8ZllIILmrL2LUAUcbGIEtfIc1lKeRHUYvRHFrX6MoehTBfO4Ji3qtVjLhlskW15LGoJH5iwOG69mRcvmUn+syxYp3a43u8zqAiD8lcwsc5IEmG0fv9cmmJWONG6c49Qde5Solh6+aFCBnYJnYFgn69kbGZ5OtpLDWtjRLdAZdmTMoRbjsDO2m+tt5vwa/vwd/KkFWgyEXH+eKMtshrrd1jmdwTSgfSZgk4AE4BMZvlw6Vp8XJ8H7Xe1d9rsD36TyHXqUPrVml7Oeuo6Y4Iw28UlQWbmcP6H12GiLEzQlWkX+7RNBy8+V8lrx8kYo1BjibWA==;5:uUppDXCy4Ofb1sthnLt/HA4TgKz7qhmltSZWAFhha0RVdxFFssnH/0WipPRCwV1HvO9uhZuKNC2uS/gHGVRMR9Qqcy/hIAPd9fhgz77yKwZeWCNXlSSfMp9TgDMkGZs97p9atorUVOvH9oNba290o4bvstIjVWHCU6LTzEFLtZI=;7:ZcTBg8f84Yxh4aZz+mhJ65jP5F7ugComMft7EWSCZUjvxV2T4YU5sRMN7wQK2RRLRexz0fFjBjMCOpEy6Qj9owFzL/dcUIbZh+XNiUhGjlyUVCzplfRvUEScYQSqpMDLZE45AMNBQJ1oxcajs/qmsBwzVqDtcOP35q6QDw9B3YLywo7NOfpzUci6PuD9D5uIzKYF3DGa/qik6/POf0zUF4oMbxWSKn/W2XcXyFObAUKWRJ5lullBppY7Y3NZxJ3q x-ms-office365-filtering-correlation-id: b6ac79cc-a2be-4137-a9ef-08d61a7e9dbc 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:MW2PR2101MB1083; x-ms-traffictypediagnostic: MW2PR2101MB1083: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; 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)(5005006)(8121501046)(3002001)(3231344)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB1083;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1083; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(136003)(396003)(376002)(39860400002)(366004)(346002)(199004)(189003)(54906003)(478600001)(36756003)(2351001)(81166006)(81156014)(386003)(1730700003)(6506007)(8676002)(4326008)(316002)(8936002)(97736004)(22452003)(102836004)(1076002)(6116002)(3846002)(106356001)(1361003)(72206003)(25786009)(50226002)(105586002)(305945005)(14454004)(7736002)(1411001)(99286004)(86612001)(2906002)(15650500001)(76176011)(52116002)(10290500003)(5660300001)(6916009)(39060400002)(5250100002)(6512007)(486006)(186003)(6436002)(11346002)(476003)(2616005)(6486002)(446003)(26005)(5640700003)(2900100001)(10090500001)(2501003)(66066001)(53936002)(68736007)(14444005)(256004);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1083;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) x-microsoft-antispam-message-info: 7HR8cXMhNwhmslTyXna2YoKi3bHLWL2vM7TXBFe8a3wK7OdSphZblGZHpQERun1rztQ1VtmMxpXUQrqp6zY07xKDYgvBX7/kPbBHiagduIlGEb8Ux34PUo4vaFFJq6lifvEC2kwaqtWBt6BHD9vZ84lnszdjqCVZjTHMftWqoL6Q4ZpwD4fbbVxEVMx/EAqJlekoKvbI+N4M4+2MjVkr/LvLNZy5sHvBMEWIO2uL56ihiR1ydIIaZdVSdJbpJoAA3Y3iVGiHgrFn76yThgRYUXBSmyztxCGQQB6Ao9P4eRsUSDExtUKf4dIxX+VLQ0Ldk1URhdlz658+EI6d2ijeRg3gtmymeYFhAP5J4qb7sYg= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b6ac79cc-a2be-4137-a9ef-08d61a7e9dbc X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 20:14:03.7998 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083 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 a warning when the old variable is set to let people know they need to update their environment to use the new variable. Signed-off-by: Ben Peart --- Makefile | 6 +++--- t/README | 4 ++++ t/test-lib.sh | 5 +++-- 3 files changed, 10 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 653688c067..397eb71578 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -134,9 +134,9 @@ 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 @@ -159,6 +159,7 @@ check_var_migration () { } check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR +check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION # Add libc MALLOC and MALLOC_PERTURB test # only if we are not executing the test with valgrind From patchwork Fri Sep 14 20:14:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Peart X-Patchwork-Id: 10601207 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 A575C933 for ; Fri, 14 Sep 2018 20:14:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E9882BD27 for ; Fri, 14 Sep 2018 20:14:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 82ADF2BD30; Fri, 14 Sep 2018 20:14:15 +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 5DC752BD27 for ; Fri, 14 Sep 2018 20:14:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728173AbeIOBaN (ORCPT ); Fri, 14 Sep 2018 21:30:13 -0400 Received: from mail-sn1nam02on0110.outbound.protection.outlook.com ([104.47.36.110]:25600 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728045AbeIOBaN (ORCPT ); Fri, 14 Sep 2018 21:30:13 -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=4ZEp9HEY0KmtE2jjsJ1KSjYVZrAZTWYlvAVyHlArm48=; b=JPr7kCTZG35+6lpBaLG57OqiObvSk9kfJ7SD6NZRHWbylsj11XzJ+qBw4wWKqAfV+ffu/WgKZdkOkIMXqxIM7RESk3dYOXlb9a4qDA0RCYTiaSFPvzmf4PP4iwpx4S7LCjkJ7vg3wTDFRSiSmdcl/04kzmg0ZFjHam5vHUaNQ9Q= Received: from MW2PR2101MB0970.namprd21.prod.outlook.com (52.132.146.19) by MW2PR2101MB1083.namprd21.prod.outlook.com (52.132.149.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1164.13; Fri, 14 Sep 2018 20:14:05 +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 20:14:05 +0000 From: Ben Peart To: "peartben@gmail.com" CC: Ben Peart , "avarab@gmail.com" , Ben Peart , "git@vger.kernel.org" , "gitster@pobox.com" , "t.gummerer@gmail.com" Subject: [PATCH v2 5/5] preload-index: update GIT_FORCE_PRELOAD_TEST support Thread-Topic: [PATCH v2 5/5] preload-index: update GIT_FORCE_PRELOAD_TEST support Thread-Index: AQHUTGd8B/zk/fLBFE6usoNc6Ny9/A== Date: Fri, 14 Sep 2018 20:14:05 +0000 Message-ID: <20180914201340.37400-6-benpeart@microsoft.com> References: <80988727-085f-cdd9-e5bb-a90a55e97024@gmail.com> <20180914201340.37400-1-benpeart@microsoft.com> In-Reply-To: <20180914201340.37400-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: CY1PR07CA0019.namprd07.prod.outlook.com (2a01:111:e400:c60a::29) 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;MW2PR2101MB1083;6:71SH1mYl/3juF5GHfWU8OKtK7AbRa87SDclDYLpjxsI8jvc9IN0OBPF5kcMKgUIVcX6k4AOY/Nq1zan5Y4YuG3l3LDj2aY4KYMRVkZoN+1z9C3bOFfdYq8S1m6Ne4MZxUW6SC/Y1eEizlvF1PsqKlz5ZBFGCIepiEh69wKeDecsI0yJ7/zl2CwV2uTIajJ1Tcxtj9DCJ5LlN9XQs7l0nRzAD/yKOWgjVGfKYQeoWgvSYGI6ZYaq/XIZTnoVABBojXtYUXx3lyrBugXAVtXU+EnXwp6T7nnqUaQaujN9juLf0S+3+QzGRby70ubBs7Z0Epy4wPQJpmixpu/bsP+TZk65ae215dSdCJDKnRToUxUSURSgcqqsOxGzdc9VE8tQ7smdpYfxghnRuFuQveKYXGVWliJfYr7DMwJSOS3EM/rEgj6TjtMVnxaTx5RSboln0psRW51h69ajmWQ8PsglsXA==;5:tTwdGYSqxcN03OmYH8/Um2Lp/lwCxuTwCGp73Vt1UFlHPxuZ2eotURKN3X74OKzUxzZWc9t8BMNnf1fE8GHXtbt+f0C9mkk9ShIH6f3hAo0c05AmmY72j8X+8xwPWkQur5e3t/q+sWuuANSTArm8f48+xk19fmvOXOwkwkCgf8s=;7:KNBaSwTKSJ51YymExcSVO9epF4woPh2kRQwobjkAp2OlRwpimWx55H0WvgZ/dJBbnibBaVIBBQTzdPu79ZAZRcOBIE2gUBS81GQr9yzcC+w7CwUSjBxk4dupo1mET+HBRlKY0s56b0O8b50B128v9bBoEHrCyn/JC64sQGNQs5CI3iTGDEupDoKzEnShlQNZa/RfM7E9lCkuP7lt/EZGgwJ+lCexcwO8sBC8cEwjVmKVmn0yNJfV5GR7Ay7a1T6e x-ms-office365-filtering-correlation-id: 95906d79-4b5a-49d3-2add-08d61a7e9e80 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:MW2PR2101MB1083; x-ms-traffictypediagnostic: MW2PR2101MB1083: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ben.Peart@microsoft.com; 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)(5005006)(8121501046)(3002001)(3231344)(944501410)(52105095)(2018427008)(93006095)(93001095)(10201501046)(6055026)(149027)(150027)(6041310)(20161123562045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(201708071742011)(7699050)(76991041);SRVR:MW2PR2101MB1083;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1083; x-forefront-prvs: 07954CC105 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(136003)(396003)(376002)(39860400002)(366004)(346002)(199004)(189003)(54906003)(478600001)(36756003)(2351001)(81166006)(81156014)(386003)(1730700003)(6506007)(8676002)(4326008)(316002)(8936002)(97736004)(22452003)(102836004)(1076002)(6116002)(3846002)(106356001)(1361003)(72206003)(25786009)(50226002)(105586002)(305945005)(14454004)(7736002)(1411001)(99286004)(86612001)(2906002)(15650500001)(76176011)(52116002)(10290500003)(5660300001)(6916009)(39060400002)(5250100002)(6512007)(486006)(186003)(6436002)(11346002)(476003)(2616005)(6486002)(446003)(26005)(5640700003)(2900100001)(10090500001)(2501003)(66066001)(53936002)(68736007)(14444005)(256004);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1083;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) x-microsoft-antispam-message-info: rAfprYdNxECA57MU3woNdSTnGj5eON0s1P8gUjtwFvf8OafOVBMvXWOAvDfQqVvZs/KMoVFKbC9Tc64Q70XugxIeHyJGDkfIQIFj2+iroK5mUct0yw+6PKa2u+MjAqXfVdYglVwTXsiJu0vFKcQOSPfT/a65r21Py+95puxlFJ1FVUD1XtsUF1wKnWdnHq41QxhctSKJ4ACOzYx1aFrpP08/y0gx6VXsXy8EmhzDkKBtwvfu16UxxqaktRJoJSMfUQtRaQRkp6Tjh+hiOtnrPupiDNjBftQEKJNjcTne9hPUL2hKrJQ8j2WDJxUBpyHi9ubym9TsCe1xqiENWLFSPsT4ymvXm5hRA+YeBOwKBac= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 95906d79-4b5a-49d3-2add-08d61a7e9e80 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Sep 2018 20:14:05.2061 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1083 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 a warning when the old variable is set to let people know they need to update their environment to use the new variable. Signed-off-by: Ben Peart --- preload-index.c | 2 +- t/README | 3 +++ t/t7519-status-fsmonitor.sh | 4 ++-- t/test-lib.sh | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/preload-index.c b/preload-index.c index 0a4e2933bb..a850e197c2 100644 --- a/preload-index.c +++ b/preload-index.c @@ -85,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) && git_env_bool("GIT_FORCE_PRELOAD_TEST", 0)) + 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 397eb71578..17a56f44ad 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -160,6 +160,7 @@ check_var_migration () { check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION +check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX # Add libc MALLOC and MALLOC_PERTURB test # only if we are not executing the test with valgrind