From patchwork Mon Jun 28 17:35:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Jose E. Marchesi" X-Patchwork-Id: 1498084 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=DIQWtcv5; dkim-atps=neutral Received: from sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GDFDW3lqgz9sW6 for ; Tue, 29 Jun 2021 03:37:31 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 21C8239C19F8 for ; Mon, 28 Jun 2021 17:37:29 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 21C8239C19F8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1624901849; bh=h3Lf5SaqxnCHbscFkUUkN9l9+x4vpM8k7m+Fv1ePQsI=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=DIQWtcv5y7A7hdno5OBa4NrZbsp1NCwnJYWv5956mG+LQHXEuqYX+D0VuUBrTYSre gphwwBepHGfGRWUewEB2EpSiOWqq8A0GkVYdDRpFIzENr/CLo9B2ERZxI+HhCt1Saz xBGULDJy8mm6/fqBsbc2PaMz/c5weWtQhLJq769w= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by sourceware.org (Postfix) with ESMTPS id 6A7B3383B41D for ; Mon, 28 Jun 2021 17:35:40 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6A7B3383B41D Received: from pps.filterd (m0246617.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.16.0.43/8.16.0.43) with SMTP id 15SHLJqD032345 for ; Mon, 28 Jun 2021 17:35:39 GMT Received: from aserp3020.oracle.com (aserp3020.oracle.com [141.146.126.70]) by mx0b-00069f02.pphosted.com with ESMTP id 39f1hchwnh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Jun 2021 17:35:39 +0000 Received: from pps.filterd (aserp3020.oracle.com [127.0.0.1]) by aserp3020.oracle.com (8.16.0.42/8.16.0.42) with SMTP id 15SHJmXb155964 for ; Mon, 28 Jun 2021 17:35:38 GMT Received: from nam10-bn7-obe.outbound.protection.outlook.com (mail-bn7nam10lp2102.outbound.protection.outlook.com [104.47.70.102]) by aserp3020.oracle.com with ESMTP id 39dv241ant-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 28 Jun 2021 17:35:37 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=khApCgM1itl9RF+09EeySx7gJkgR8nh5aagAvA7bVIPG7AgsSQaFIPpWP5sPPF7Gw9tJaFZzAToFtpsPEzXwiZf7gIUoJwrmGyhW3Y8ievg1e/qZGvHue06qb02OOZwGFE1RK5Eei45CfbWX5AFiyzFFBXUlDwTRNqK2qj03TrARo5QSPFZI/6PWMmWlNxENMRV+0MRe6BWr88Ozqmqee2l3JKSh4ssaiOwRnO/y8lddGjVC/J3DSSy3lJljE7hcO6jsGvkKyQzGPD8muQRatT5eR1QR2yesWDoghPUANoLGLL9p1E/R1G8fekpVZnneJjA182KGEjyRaz5LS9EUMQ== 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-SenderADCheck; bh=h3Lf5SaqxnCHbscFkUUkN9l9+x4vpM8k7m+Fv1ePQsI=; b=YPk6uhjdo7KEH7zDptgS/JOujUQIvIEucTbhod37DEoN+j4IqU6PFAEanyrTzSqZ/JB6fghxSI05l/+uOiJtEP8AiKv8NMG5EStb3DDZ154htM562MLWsuQn0RF3jK+OqAI/NIwC/gsdTSX/VbI4txCLWInPzyz1Kxz4NpUDP8NwG+qgRBzf8WnIlYwBoWAB7AEQJAF3MZyxaJo1N8xOBV+dqgQVX0Ka3rd5rvuXcvfC0I1q8jQ6+rWNH9q31QXnqmTBIMvoQtoPUyrGhG9IWfdrJ9N58Z+epx0PEFVXVKMQpa1Fj9aa63bicIdy6BgZNWGKBIE275AjP37qIzW8Wg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oracle.com; dmarc=pass action=none header.from=oracle.com; dkim=pass header.d=oracle.com; arc=none Received: from DM5PR10MB2041.namprd10.prod.outlook.com (2603:10b6:3:111::16) by DS7PR10MB5200.namprd10.prod.outlook.com (2603:10b6:5:3a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18; Mon, 28 Jun 2021 17:35:37 +0000 Received: from DM5PR10MB2041.namprd10.prod.outlook.com ([fe80::3c15:20ad:f67a:eb04]) by DM5PR10MB2041.namprd10.prod.outlook.com ([fe80::3c15:20ad:f67a:eb04%12]) with mapi id 15.20.4264.026; Mon, 28 Jun 2021 17:35:36 +0000 To: gcc-patches@gcc.gnu.org Subject: [COMMITTED V10 2/7] dejagnu: modularize gcc-dg-debug-runtest a bit Date: Mon, 28 Jun 2021 19:35:18 +0200 Message-Id: <20210628173523.29350-3-jose.marchesi@oracle.com> X-Mailer: git-send-email 2.25.0.2.g232378479e In-Reply-To: <20210628173523.29350-1-jose.marchesi@oracle.com> References: <20210628173523.29350-1-jose.marchesi@oracle.com> X-Originating-IP: [141.143.193.71] X-ClientProxiedBy: LO4P123CA0283.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::18) To DM5PR10MB2041.namprd10.prod.outlook.com (2603:10b6:3:111::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from termi.localdomain (141.143.193.71) by LO4P123CA0283.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:195::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.18 via Frontend Transport; Mon, 28 Jun 2021 17:35:36 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 21d112c4-4682-4087-0d6d-08d93a5b23c8 X-MS-TrafficTypeDiagnostic: DS7PR10MB5200: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lP7eFA132Y9ElBn/rJM+hUHXoTec9suUGvdxiiaVrRNLzs1MujzUkwLqajrPfQOPe273fWRzJmQCXtl0041zkPbsPul155BamrLPMqakkxb6hwa4xDvqHyOaBHZ4bBeDfyrWcbRr52dOL/p2QHjteCjWK+OhLT4xOKw+PYFsxKl/5rCnveCzoV8+IFlIkLeVU2e3SkG6P2OhYgB+bFgShIjjD8JD9Hf+A0NvborPOIxIvmK+0Pl5AD49AXjXxd18UQaumnHvV06BEv6ioqs2j9OCVG56yGfgakdkQJoM38zWvBJksLchpBDzvy5Vp+rt4XWZ+SsagwAsBG8QrPa++ZyhCsP7txmWHCWlgeU49PqmLuAiXbQz0pG/WiMZ2PpeV6+bQPo4uj1mJDopNtoECh4uaLGeZBGEdcr1xIaGJq4rHacooOUtzx4fyT7JxZti/uPYqfQM0f54+FoBpwjsQGLMP5QbPnIjKbPaM5VVg6nBoW6ibTt154lYWNyrcdDb+T7IK7+Es0Mej6RYYbFR5trsNdlxNbxrT0eEhDxO0s/U3jwpGfPUhfAa07xMdiw9YZuYaLG8pV5PL0otSQ5P+JXnr/QzHRB00Tbalk3t7aCJBJmbb4wMTn/cimQaljx56cdbUWnFGYQxw+m+dfJC2nkiGLi1yl9gxIdL0SBPMhjr/Z20Fcb6S9wCyNuwB74O X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR10MB2041.namprd10.prod.outlook.com; PTR:; CAT:NONE; SFS:(39860400002)(396003)(376002)(136003)(346002)(366004)(6916009)(83380400001)(2906002)(6512007)(478600001)(6486002)(16526019)(66476007)(1076003)(6666004)(316002)(6506007)(38350700002)(38100700002)(8936002)(5660300002)(2616005)(956004)(36756003)(186003)(8676002)(26005)(66556008)(66946007)(86362001)(52116002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: iapClq95hyYP2++NgxSiqn4BN46jcGDcKiPWsxGY7uKvDJs81naTk9NaVQ9yQ6pThHE4rLKPU6ZEkQQktRH5/0hPhQphw+J2zLspivs7O9WvR+u94SMWcg1FGkW864pfMP0M2pThx6aonxwkcv/MgQbV28KirXlO8hLHoT5d3P+qNtbuOOjejiWHsRzrpGMwJVaQcaZC/vhG+mQpCnM2JXhYtNAIG2pjEnz19K7UHnSmfJdfgb/3mfXDFd06tFalUpgKtSTQHl5YFjIgxTZrcwQz6A0S1byvPJo8+3HrrrHZ6jLvGe+3dKyZ//HFeliT/dZ3bWyF/Gc9m+ly/jJcXAHQ550WE6BLPi4tKqrrXW2lDrClL60tklc2uk3bNorQy1Ul2qu1Sx8ltnuy1HrXmUaV9IYapQqMpflgn7ORYrXmeioElHdiSOQnrqEFl3THWdbB3gMEAXvtkb2lxqsd3VlQBPN7K1apF5nVLpjjFaOJ+Bpg1zR0S6x0dI87y3rD7vQnz7zgYc4zBlVm7DRTa46cIe7hjGEXub5xqGx70DTBV5Vcz6jqDSm4LJVnxz/KIp9Dh/s/3ZVAqlshhtg5BvgA6str4QnjRZIzfC0cT+tliGhGUsz5sFaKama27AT21HKOFbGfNvHhaXxd4IcYejK/GTjYLQtghiDPqnDzF7cn2lFQXONU0tAVTOREJhoHuOFGbIL0VsAANVW5DHEWXJzLxqLDvDV8Nc10gjsjfCDbOQwuORoeVR2oQzaFWQzENpwDjl8sZfn2V6pbBc9xGeaFajdwMtYi/LR04o7sRT7ZLoJkmHxOwAjpwa86yHvTekveaBZ3JsJMrXVWJJCJUUyCOJnwmQZ+JVorEvbhnXvuMlSPRZ+wCdcaHZK7Ptk71mddDNztXUVaBuH3dVvnp2vSbxB462N+vD1p/Yu8LWsqFCPi5H5h/RDCcxmX85uqSXCAvsnILPyvgc7ayIoXlcb2tefKxoAqD45AyJIwpar7mMqaip5YiFlm/ULAfSni+VMDgA99VUvXOm/+/U1Jtr/2l/y8nusj5tXiQtUTgfVSlcSlYkx0ZQw3qygp5la28zFWwZjkPwS5asvbvKmL+Eua3HafIyXdc0a5B6oo6O1Y35OPtcfMhq+nKK11H9K4hEmiP6NJDLmHqxRdzWONoCYORmlO22aGKo/SU6w5mDJ14qar5Wl/+jiI2zr/MgLwgrUde66tFMJ7I9fUQ+oaLZahFN75YQRJDy1GaN/Zt2OBsNHSwskojsp7cRR+ppqS5HMbGOwZJwWld/5X2UAzb8wc46/DTNAq3+Y90DaWWSc8GZiQmEX0EOPCb5KuI8Dy X-OriginatorOrg: oracle.com X-MS-Exchange-CrossTenant-Network-Message-Id: 21d112c4-4682-4087-0d6d-08d93a5b23c8 X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB2041.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Jun 2021 17:35:36.8622 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: rJ975qLfFsRzXXY9579CScqCI7H9bBNtZzcC3wGTALvI9VNgb6RCHjRdQtZ+Y4AUxIj/ckw6kefGp7vRMMAURChBVPc2ymuv8kwXJHHtjPE= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5200 X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10029 signatures=668682 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 spamscore=0 adultscore=0 malwarescore=0 mlxlogscore=999 suspectscore=0 phishscore=0 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2104190000 definitions=main-2106280115 X-Proofpoint-ORIG-GUID: HV4BjXkB4U58n9WmtnULiQeFZ-W8tCL7 X-Proofpoint-GUID: HV4BjXkB4U58n9WmtnULiQeFZ-W8tCL7 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: "Jose E. Marchesi via Gcc-patches" From: "Jose E. Marchesi" Reply-To: "Jose E. Marchesi" Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Move some functionality into a procedure of its own. This is only so that when the patch for ctf comes along, the gcc-dg-debug-runtest procedure looks bit more uniform. gcc/testsuite/ChangeLog: * lib/gcc-dg.exp (gcc-dg-target-supports-debug-format): New procedure. --- gcc/testsuite/lib/gcc-dg.exp | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index fce0989cd9c..c7722ba07da 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -621,18 +621,27 @@ proc gcc-dg-runtest { testcases flags default-extra-flags } { } } -proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } { +# Check if the target system supports the debug format +proc gcc-dg-target-supports-debug-format { target_compile trivial type } { global srcdir subdir + set comp_output [$target_compile \ + "$srcdir/$subdir/$trivial" "trivial.S" assembly \ + "additional_flags=$type"] + if { ! [string match "*: target system does not support the * debug format*" \ + $comp_output] } { + remove-build-file "trivial.S" + return 1 + } + return 0 +} + +proc gcc-dg-debug-runtest { target_compile trivial opt_opts testcases } { if ![info exists DEBUG_TORTURE_OPTIONS] { set DEBUG_TORTURE_OPTIONS "" foreach type {-gdwarf-2 -gstabs -gstabs+ -gxcoff -gxcoff+} { - set comp_output [$target_compile \ - "$srcdir/$subdir/$trivial" "trivial.S" assembly \ - "additional_flags=$type"] - if { ! [string match "*: target system does not support the * debug format*" \ - $comp_output] } { - remove-build-file "trivial.S" + if [expr [gcc-dg-target-supports-debug-format \ + $target_compile $trivial $type]] { foreach level {1 "" 3} { if { ($type == "-gdwarf-2") && ($level != "") } { lappend DEBUG_TORTURE_OPTIONS [list "${type}" "-g${level}"]