From patchwork Fri Sep 9 10:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Torbjorn SVENSSON X-Patchwork-Id: 1114 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5044:0:0:0:0:0 with SMTP id h4csp647514wrt; Fri, 9 Sep 2022 03:28:51 -0700 (PDT) X-Google-Smtp-Source: AA6agR4i++/5n2UkZuZUhD2K/9FVEQltDFhBvNuO7/nA5odDOvpzWbjDDyIxpeDY/O4XTCVNqDDo X-Received: by 2002:a17:907:c23:b0:779:237a:4218 with SMTP id ga35-20020a1709070c2300b00779237a4218mr3392672ejc.277.1662719331615; Fri, 09 Sep 2022 03:28:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662719331; cv=none; d=google.com; s=arc-20160816; b=NaI+PaUyCY6VcGCAUhWhRWgZPatptanpee86VTYQ8mH4naNnuPMr4o0hMbqd4UAxKj rCmFz1YsLrl3JhjqcvWMMospv51yv/WOy/CMT/UjZTeqYBWk609SWXssj+noP72ovw/A W1cwiyrEUSD2zVNPWKO6UU9TVR3jS0QBg1cwE0FN8OKpTqkx1oGQAiTyKzw7wtXpVkR0 Pq1U66xBeGO7LRsmAqHQtO3Jta0VsCzxdHkCybPIbqvLvCBNJERq6Ny0pyvsvIBsWJ9V +JO+a+w5dOd7POShuIIPfJTeUs5Bdfg57K/tJ+IzlY812kOjeXfdm6dN4IFpCu/XvwoO 9ycg== 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=zYpfYjDe7vnMgyIVm3vdv40lPW+D1BJIUdNQIL38z2E=; b=FOY4OZmqaUpHkYVF+eJ3Wcb7WOI6CSBphh55bSJQ7iwH0lDXug/tNYQmwdCvsgVdI7 YT+eOUPqWB9qKJ7ABWOWjWG3vOlM6dR2LIUduSPZqXuFoElQngCa7YWnTs5oEzbBYD2+ FEaK/O4dhwcJSLuyQvs4mQWK8H9hJFw1BFKqCqLwsplf5SCt4eN5wLm8bqa+47nCfpJk UP9O8df7UZRM03Da9PQ98Yd5QCDmuB/htK0+Qr09fa8fiDyu6gn+GdZPb56enND7EKEU ibQFzLQAweOWJVgtQPuBmrfA83yJGvBEofiRF6STlp6yM3JvBn9tlP+KzEiAV0KX5Hf0 Onnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=vX+yxqXx; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id i5-20020a05640242c500b0044e80232026si157234edc.464.2022.09.09.03.28.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Sep 2022 03:28:51 -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=vX+yxqXx; 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 7A1373857340 for ; Fri, 9 Sep 2022 10:28:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7A1373857340 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662719330; bh=zYpfYjDe7vnMgyIVm3vdv40lPW+D1BJIUdNQIL38z2E=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=vX+yxqXxqqD+uK3qZ/Ld8u0hVnZw7GToHpUv5Q9Iw9AwoBZMcQPqXFXPg549gry5A NY1tzMKcKQR1+KYc+658LhdjGA6a8ivirCWBjDFSvQh7+Gq9yDY4JRTXEN+Ml+fTkx oVW/5vxbKyZOZDHfsufM+0p5H8xQ8DUzTQRrt8o4= 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 47EBC38582BF for ; Fri, 9 Sep 2022 10:28:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 47EBC38582BF Received: from pps.filterd (m0046661.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 289AGjSf031498; Fri, 9 Sep 2022 12:27:57 +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 3jergbgb1d-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 09 Sep 2022 12:27:57 +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 5CE4E10003A; Fri, 9 Sep 2022 12:27:40 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node3.st.com [10.75.129.71]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 46079222CBD; Fri, 9 Sep 2022 12:27:40 +0200 (CEST) Received: from jkgcxl0002.jkg.st.com (10.75.127.121) 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 12:27:37 +0200 To: Subject: [PATCH] gcov: Respect tripplet when looking for gcov Date: Fri, 9 Sep 2022 12:27:08 +0200 Message-ID: <20220909102707.2557434-1-torbjorn.svensson@foss.st.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.75.127.121] X-ClientProxiedBy: GPXDAG2NODE4.st.com (10.75.127.68) 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_06,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?1743487585949607297?= X-GMAIL-MSGID: =?utf-8?q?1743487585949607297?= When testing a cross toolchain outside the build tree, the binary name for gcov is prefixed with the tripplet. gcc/testsuite/ChangeLog: * g++.dg/gcov/gcov.exp: Respect tripplet when looking for gcov * gcc.misc-tests/gcov.exp: Likewise 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.