From patchwork Tue Jun 28 14:06:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 55488 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 20A523987FC3 for ; Tue, 28 Jun 2022 14:32:42 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 20A523987FC3 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1656426762; bh=j62ojGCQPklQBlR92ALh1ZHmOA+QFpo7dYmkNVl6JLs=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=XF3A7KAPDeHEO/c0X4W0y47rltXoWGW+cpuevc9nGGK3dEtXvWTa9au1ufBIUXHvo UbnVkf+IfI7BqR8xtt+XAgFChTvbVAoewl3NVdKDrDcOIwdASj+qWEwKDOXRSMlYoT w5sxfP27MeP8xU+iV5xx6Erh4lbTDTj/KCmGfTYY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2081.outbound.protection.outlook.com [40.107.21.81]) by sourceware.org (Postfix) with ESMTPS id 51B7C38A90A3 for ; Tue, 28 Jun 2022 14:06:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 51B7C38A90A3 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FSrJUF9aKy0fFuRYqq+IpdtYTpvL4kk7k021FXO5Qal3iIBgF/DQPv5IsMWm8VlBqVs/wt+sZXVdRAmpGyigdacsy+Edz97ciTOmcLcXWDNcBvgHclgfOk1BBO8ar7jb4zVdu3Dp6ykzrXorGpW9roZLYSOfb3bXl76hUCkmbwOQfDp1lpsSUxZqDjTsDhSiEDWFHFGgCcd1mAQDVyLna/aZ66rBe48J+ZavFn/bh1gBvi3vaXKvgAyHsJmsnmAnD1Xvp98C7YQ56uqsM8BJYMDJGp3QIoHtPSzzfn3UpwrYa4cdKV1hyYl0DedQTNBghPEUZuCUgbBAb/9M9h5AEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=j62ojGCQPklQBlR92ALh1ZHmOA+QFpo7dYmkNVl6JLs=; b=hNciyNXexTvPNuv/ERcLUDZjpbx3ANsUHeVfb3CrbJptN54IHdeO7OLM4vdHd/5dsaLFbxrOQ8TEOGq09GG7RzXIyPbWasCXxMG753xrjHgMY9uMknRwfiLcGJ1fdZQl0i1NWQYt/sCQRWUCNLgsqgp6N5vC2LI0V4vpavssHure+tCK19OJ3knN9US/j/Vpz+xrbYmiC3fV6FlrjK13gTwzQLZpT9xLD2RaJZepeAMZy3W2Ia8Gwciqq/Wn1cuW+imdfj3r25lRvyYigdiK6lcuWv6ehblouY/DvElBf5A/wLsQxbXaM+c7sHIXIGKgKT68GMOEZ6IDkWH5b3Ej7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none Received: from VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) by AM0PR04MB4435.eurprd04.prod.outlook.com (2603:10a6:208:76::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.18; Tue, 28 Jun 2022 14:06:04 +0000 Received: from VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b]) by VE1PR04MB6560.eurprd04.prod.outlook.com ([fe80::dfa:a64a:432f:e26b%7]) with mapi id 15.20.5373.018; Tue, 28 Jun 2022 14:06:04 +0000 Message-ID: <06eaf96a-1832-8797-28e0-00b1cb8866bf@suse.com> Date: Tue, 28 Jun 2022 16:06:02 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.10.0 Content-Language: en-US To: "gcc-patches@gcc.gnu.org" Subject: [PATCH] testsuite/C++: suppress filename canonicalization in module tests X-ClientProxiedBy: AM5PR0602CA0017.eurprd06.prod.outlook.com (2603:10a6:203:a3::27) To VE1PR04MB6560.eurprd04.prod.outlook.com (2603:10a6:803:122::25) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 271a0c36-7079-49d5-4b99-08da590f56df X-MS-TrafficTypeDiagnostic: AM0PR04MB4435:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KJoF6YciKFbUQ0JmjaJEDI6X+6xo6ce8q0ARUg1XovQYUuyDGRmCTOzbm5ttyZ0C3fzTG10X+k/DWvnwKsCbVwCZkG4lZGxKY4+PIKWV07y63vooRhMJZL08oYA1CnhoOUSVxnpA+gu6oL1+qFl+DgdvYOuwhs0fKRwfm0eCmZR+RcpchxpoB597CKBFj6Ga7+tqYuTzv32IjUR3rSu5WSrpZ/uC4Un230W/pZ22P/gPkexg2nTPbuXDAB0V5H3Eh8aYTt1dtgXdFfabGjOAb1HLqrNtZqhLi9GIgiioX5ezRvr6bccJRbXGxcAmY7Gcftm8QWTU97Pc7zoWebsL73x8GM46yUDGIloOk3LDXmVOiysphOgFM/QrbGrIPUnRHJN7/UEIo4/MH4b3SgW1l8jnfazjbJQkyvz8c0OilDV/Nioa2YkI3x0vEcuxyPtJZjMOPCru9BG9k/ndhJvNTq0WRRnlZ1ENo+Y0zD+rQm5N9RdDb9+i9qjdekx7vcih6OvjqOKOAcxM97dZD5nKY/opcNMoxvnl/TcrgfQ5Db+bxIRQcUuMCIjUEjhCJOBNIiu7JaGO3I6J6wdRbTl/KNIwZxqcKEmfD1RHZW7upOogXns7LPj1nwbv6t7y37hkk7lhuT4t4VI99gdid74YCBbIBrrzR0FVCkAM9myb8jPKFwB/BdcQcVq0YYlq3JsubDQ4hNSW+rOSC+wfuMD3xkjI16A9l6o3Xb7IqyaQp+pV/aHPOHn31eiLB9BCr3C7XUVLHp4IftJp3GZ9j3XBeVvUA4zGkSM/cKFbrQfcBIjCmrqLnYoJmYPGtU6Y6ItTXwVFWw1o0Tc8D1+7qPyRnw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VE1PR04MB6560.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(346002)(366004)(39860400002)(376002)(136003)(396003)(86362001)(31686004)(2906002)(6512007)(6486002)(54906003)(6916009)(5660300002)(36756003)(66946007)(31696002)(186003)(6506007)(38100700002)(66556008)(478600001)(8676002)(66476007)(4326008)(316002)(2616005)(26005)(41300700001)(8936002)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?OErHgqJpE2HEYVsSQShcGKdWpHN7?= =?utf-8?q?LWdX6t6czspJUQHmUStu9jNXnFsX3/kapuPoRfleka3QOyBK+OxLZf4hrd7Y7OBxa?= =?utf-8?q?foD/qZYNGxrjC+poFuA0biTrqboby+N/SzaRHrFOUDYVHzFYQjORFlyCoSlu/+YpE?= =?utf-8?q?r5pIStz8S9yhj6dpSkaTgMUslGrhJrTrnIvx8WNmTrsaTtqCcXmTZOZEQ3PeD/CGI?= =?utf-8?q?b/nta2Qb2mFO0e4RM4lU0uqu2S+Utpk3BaSj7kIYD1t5yzxPGBnmGDeCCkhtpVxGp?= =?utf-8?q?uAkOW3btRdo0k8c0yr/QdCknvPUd3E4ke844z6hXHWz2E8Me6UNEdsmglncwEe0PM?= =?utf-8?q?r9e/MNaoPQdECTuKQkGgHH6403ax8eK30R7iwF/lR8hkF3dS/HBcRphbGHL0ugU4T?= =?utf-8?q?t7eCOCi046194L5pE4vqg8F32f/I5FiQRxgFNZ49QP2rw7n61Q410ov1Q+GvyAwET?= =?utf-8?q?GwYpzFcM/KGjz04gd78sW+OmDtBprP8KKehxWmbd0uK+ldvoltn2Txo/J5rAM0zkd?= =?utf-8?q?5ghr/zbTeUHZToxmcspr+AITsyGe4VqYai6wBL4eqqdV89WiBmMdQRIi1aXYgm3F3?= =?utf-8?q?jof8pSL66R1KHj+Tttv0bUZd+WMdoryC8ABjSScfGdI93gAddO47+uu5072uqGZPj?= =?utf-8?q?RgHVN2ebggqJhXhVFeFXC4WyCsPXA0Lhnk8wD509Uzk+B+RAhl1R0uHU4XdJPiV8o?= =?utf-8?q?xidDpfof4Elv6/d8UYHT82YjFmqvYY6RxNunZQAcoyT3RI5BqPBrVmFcS9kS3MMFt?= =?utf-8?q?d5CjZJQ7+n0voirxoizhy6j5VwLLdI0rF3eZTo8TSAtdZtTvt8XpexhTdkJpioRZt?= =?utf-8?q?nx0MuOqwlibJ/xQANyWk65OOO0AfR5JZ/eVBU4u5ofaSfNWj24N9ZjNPerBrqjWv+?= =?utf-8?q?dMvYp8OgQJ1+6ZFfBa5fsYOeqz/35v5lEtsyQQRlBRdzWeVPD5qOE6vyMSiPfdMs0?= =?utf-8?q?ZhvS01eOpsQvceRm8s6BWScNbSnKMS8IGvtawTKUpW5dSKXyq3QlHWsUrmwbqRhcs?= =?utf-8?q?K/sMBXjDGq1VdN3t+BlAti275nV6zVPuuiUIRhORYIJz7AhHKio1eSWj26TbuGKyP?= =?utf-8?q?mIH7vtWl7wTb9QWxOkO4rOfxwm9TxlzMSClAO+8HnhM9Dm93DjaUy+1jIgDrwamIW?= =?utf-8?q?b0oPdiJJodFlbNFeQkyPw+yMNfpnyUmMqz1VD4+FUTg/yU5BryCqOVU4ZhMfXfhw4?= =?utf-8?q?22IFeR17CySwIbHHFV1QInp6UHuFViQrlwGOcPawmUHq/SR7AscigOgyiNRCpwOnk?= =?utf-8?q?mj8UVnoK5GbI/RI9jn9lbcSTi6We3D/84x+H7BgDLNARo8s/mzh0bF4v4C2EwkFAk?= =?utf-8?q?mqioq5ssziaAp9IpuS0bZqK3aixhVKFdp0+oI82sELhnT+feu7zbg8TVLJ0ClU2FZ?= =?utf-8?q?GyV+Ms7Nd4owc2pKWVG3T0hMNw3dMW9uQDGVrA678qOHCfKpFiN4Ez8L8Eon5HHkc?= =?utf-8?q?UcjRVtjWzdHL7nmeAuFDOHnqZGssq59AVIi0Zw0m11pDJj9YQeAagV+8L9fw0LIO8?= =?utf-8?q?qikNvy+KnPez?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 271a0c36-7079-49d5-4b99-08da590f56df X-MS-Exchange-CrossTenant-AuthSource: VE1PR04MB6560.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2022 14:06:04.4764 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xnTcDYmhLirpGR7+IQClO6DY10CK5Hd+zwGd+YnD/y/Jp4lgi1iVSJGc1SaWkx2cqZX37ZWTOv9hYkZB682NWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB4435 X-Spam-Status: No, score=-3030.8 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Jan Beulich via Gcc-patches From: Jan Beulich Reply-To: Jan Beulich Cc: Nathan Sidwell Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The pathname underneath gcm.cache/ is determined from the effective name used for the main input file of a particular module. When modules are built, no canonicalization occurs for the main input file. Hence the module file wouldn't be found if a different (the canonicalized) file name was used when importing that same module. (This is an effect of importing happening in the preprocessor, just like #include handling.) Since it doesn't look easy to make module generation use libcpp's maybe_shorter_path() (in fact I'd consider this a layering violation, while cloning the logic would - at least in principle - be prone to both going out of sync), simply suppress system header path canonicalization for the respective tests. gcc/testsuite/ * g++.dg/modules/alias-1_b.C: Add -fno-canonical-system-headers. * g++.dg/modules/alias-1_d.C: Likewise. * g++.dg/modules/alias-1_e.C: Likewise. * g++.dg/modules/alias-1_f.C: Likewise. * g++.dg/modules/cpp-6_c.C: Likewise. * g++.dg/modules/dir-only-2_b.C: Likewise. --- Strictly speaking it could be necessary to also suppress canonicalization when generating the modules, but for now they're self- contained, i.e. don't include any "real" system headers. IOW at the moment the tests aren't susceptible to the issue at generation time. --- a/gcc/testsuite/g++.dg/modules/alias-1_b.C +++ b/gcc/testsuite/g++.dg/modules/alias-1_b.C @@ -1,4 +1,4 @@ -// { dg-additional-options "-fmodules-ts -fdump-lang-module -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -fdump-lang-module -isystem [srcdir] -fno-canonical-system-headers" } // Alias at the header file. We have one CMI file import "alias-1_a.H"; --- a/gcc/testsuite/g++.dg/modules/alias-1_d.C +++ b/gcc/testsuite/g++.dg/modules/alias-1_d.C @@ -1,4 +1,4 @@ -// { dg-additional-options "-fmodules-ts -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -isystem [srcdir] -fno-canonical-system-headers" } // { dg-module-cmi kevin } export module kevin; --- a/gcc/testsuite/g++.dg/modules/alias-1_e.C +++ b/gcc/testsuite/g++.dg/modules/alias-1_e.C @@ -1,4 +1,4 @@ -// { dg-additional-options "-fmodules-ts -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -isystem [srcdir] -fno-canonical-system-headers" } import bob; import kevin; --- a/gcc/testsuite/g++.dg/modules/alias-1_f.C +++ b/gcc/testsuite/g++.dg/modules/alias-1_f.C @@ -1,4 +1,4 @@ -// { dg-additional-options "-fmodules-ts -fdump-lang-module -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -fdump-lang-module -isystem [srcdir] -fno-canonical-system-headers" } import kevin; import bob; --- a/gcc/testsuite/g++.dg/modules/cpp-6_c.C +++ b/gcc/testsuite/g++.dg/modules/cpp-6_c.C @@ -1,5 +1,5 @@ // { dg-do preprocess } -// { dg-additional-options "-fmodules-ts -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -isystem [srcdir] -fno-canonical-system-headers" } #define empty #define nop(X) X --- a/gcc/testsuite/g++.dg/modules/dir-only-2_b.C +++ b/gcc/testsuite/g++.dg/modules/dir-only-2_b.C @@ -1,5 +1,5 @@ // { dg-do preprocess } -// { dg-additional-options "-fmodules-ts -fdirectives-only -isystem [srcdir]" } +// { dg-additional-options "-fmodules-ts -fdirectives-only -isystem [srcdir] -fno-canonical-system-headers" } // a comment module; // line frob