From patchwork Fri Sep 9 12:56:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Torbjorn SVENSSON X-Patchwork-Id: 1119 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp701245wrt; Fri, 9 Sep 2022 05:57:39 -0700 (PDT) X-Google-Smtp-Source: AA6agR4pGelMFP76xNge3G7UgMhaTECXE6HMFyxxDgr6dW6hWRukp3yjAi2HyvvohkWChxZnZlaO X-Received: by 2002:a05:6402:26cb:b0:448:2af2:bb81 with SMTP id x11-20020a05640226cb00b004482af2bb81mr11243204edd.424.1662728259611; Fri, 09 Sep 2022 05:57:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662728259; cv=none; d=google.com; s=arc-20160816; b=bAotjLeXNvpt2A6q19SyuIUPDJ7cr2E3Ap3mHZveYgf0UU/1zxiUdcsYmNJZUpVa+7 V3tldvyPOCrnBPpRegGbK49YeorP76EbTTMgEOOrz+dqOYU6d+l0xX6k5s9E5+dWjNB0 cLq47BjUhJ11MH4kIIH32svtoftgm73EDiacYoNOlTn9WUGl3qfj7P7fk8a9+a5De0mg RTk+haAIdW85ZAa9p85b8PV3BXip/Ttmb0dRvICfdeoPrnTXb4LUrWtOyh/XObNXPeC5 90LQF/r77VLTI0bH5nU0q2nwUC80a8xZbS1O17hA8+HEJ/pIm7Fwy0Fd/mqitHwXVucw iZqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:to :dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=AipvNuRP050ieZc8ake+gDb3gD/qRCQ6ItgQ6uVsup4=; b=LXZz6HZ347Z8OCGOqgcsYua7FUsvnFSRMxgCZtqg2tb35YTduZ93qoopa66nyUyjZS 2ZPceW7/9GoVdxrXhXfG4u/pJuoT06Nd3SX3j1qZwimq4TMflsqyWFcwZcVInvcXb5Td QkYNofcjqA81Gdi5IQ0cAXaW2JzRod04mU7KyH+Vf0ih3JEhUPR+smkDmNsf3+/gyW99 JoG7zYb2+QNrzRvar1TDVmrjZosnfpEHJwOO2NhIWRvMp8y+YepcvSKsUYHsv1JsSZLQ StWJmrFqjOOH3LIorSx2qT/M1jcUyg80X8f4gsLIClFR5cXJqlKRYEL3SkKA7/0Mp9b/ 53vA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FuhFP6rg; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id l25-20020a50d6d9000000b00447a70e89e2si399901edj.195.2022.09.09.05.57.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 05:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FuhFP6rg; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7E943385741A for ; Fri, 9 Sep 2022 12:57:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7E943385741A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662728258; bh=AipvNuRP050ieZc8ake+gDb3gD/qRCQ6ItgQ6uVsup4=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=FuhFP6rgVIIcG5dE+1Wbwaj5MnwdMIo7vbkvhfDgJloJ8RAqx5CoXO7VQ4AED+kRz FXIttLCHOnQOj2bjecML+wM1P5nu6TNAnfkzmvziH0ze9tuMIBT9nJm2fXocWwneOw Q0/kuAXaRqV9imby33Pg6gocSORaYR1wF2OF48BI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx07-00178001.pphosted.com (mx08-00178001.pphosted.com [91.207.212.93]) by sourceware.org (Postfix) with ESMTPS id 09C2938582BF for ; Fri, 9 Sep 2022 12:56:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 09C2938582BF Received: from pps.filterd (m0046660.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 2899xrLd028502; Fri, 9 Sep 2022 14:56:48 +0200 Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3jfx0p2x2p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Sep 2022 14:56:48 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 5446110002A; Fri, 9 Sep 2022 14:56:46 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 4F8F421FE87; Fri, 9 Sep 2022 14:56:46 +0200 (CEST) Received: from jkgcxl0002.jkg.st.com (10.75.127.50) by SHFDAG1NODE3.st.com (10.75.129.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.2375.31; Fri, 9 Sep 2022 14:56:43 +0200 To: Subject: [PATCH v2] gcov: Respect triplet when looking for gcov Date: Fri, 9 Sep 2022 14:56:25 +0200 Message-ID: <20220909125624.2561867-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.75.127.50] X-ClientProxiedBy: SFHDAG2NODE3.st.com (10.75.127.6) To SHFDAG1NODE3.st.com (10.75.129.71) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1 definitions=2022-09-09_07,2022-09-09_01,2022-06-22_01 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, 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: =?utf-8?q?Torbj=C3=B6rn_SVENSSON_via_Gcc-patches?= From: Torbjorn SVENSSON Reply-To: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= Cc: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= , nathan@acm.org, hubicka@ucw.cz Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1743496947715875624?= X-GMAIL-MSGID: =?utf-8?q?1743496947715875624?= When testing a cross toolchain outside the build tree, the binary name for gcov is prefixed with the triplet. gcc/testsuite/ChangeLog: * g++.dg/gcov/gcov.exp: Respect triplet when looking for gcov. * gcc.misc-tests/gcov.exp: Likewise. Signed-off-by: Torbjörn SVENSSON Signed-off-by: Torbjörn SVENSSON --- gcc/testsuite/g++.dg/gcov/gcov.exp | 4 ++-- gcc/testsuite/gcc.misc-tests/gcov.exp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/g++.dg/gcov/gcov.exp b/gcc/testsuite/g++.dg/gcov/gcov.exp index 88acd95c361..04e7a016486 100644 --- a/gcc/testsuite/g++.dg/gcov/gcov.exp +++ b/gcc/testsuite/g++.dg/gcov/gcov.exp @@ -24,9 +24,9 @@ global GXX_UNDER_TEST # Find gcov in the same directory as $GXX_UNDER_TEST. if { ![is_remote host] && [string match "*/*" [lindex $GXX_UNDER_TEST 0]] } { - set GCOV [file dirname [lindex $GXX_UNDER_TEST 0]]/gcov + set GCOV [file dirname [lindex $GXX_UNDER_TEST 0]]/[transform gcov] } else { - set GCOV gcov + set GCOV [transform gcov] } # Initialize harness. diff --git a/gcc/testsuite/gcc.misc-tests/gcov.exp b/gcc/testsuite/gcc.misc-tests/gcov.exp index 82376d90ac2..a55ce234f6e 100644 --- a/gcc/testsuite/gcc.misc-tests/gcov.exp +++ b/gcc/testsuite/gcc.misc-tests/gcov.exp @@ -24,9 +24,9 @@ global GCC_UNDER_TEST # For now find gcov in the same directory as $GCC_UNDER_TEST. if { ![is_remote host] && [string match "*/*" [lindex $GCC_UNDER_TEST 0]] } { - set GCOV [file dirname [lindex $GCC_UNDER_TEST 0]]/gcov + set GCOV [file dirname [lindex $GCC_UNDER_TEST 0]]/[transform gcov] } else { - set GCOV gcov + set GCOV {transform gcov] } # Initialize harness.