From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id F1874385C300; Mon, 12 Sep 2022 09:42:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F1874385C300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1662975751; bh=0HADPlTFtcbdLPrTOcR/AFItRt77SHwp5tkJRULb98Q=; h=From:To:Subject:Date:From; b=Ry4nchtJ5/Hq8x5jx0l4KL+UxLUsKxYunH1/f0iFID78t8lys5Fi8La/KbeTfqmXN oeNqeNDvMuF/GNPHqY2HngVn3iHvRumjDnHG+gnIhEsd45rinb13SR7ByhjovdP/bO bqWHhf44HrSyLzuYSK9VsFymcB9iIy5xpiJCXYf0= MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-2619] gcov: Respect triplet when looking for gcov X-Act-Checkin: gcc X-Git-Author: =?utf-8?q?Torbj=C3=B6rn_SVENSSON?= X-Git-Refname: refs/heads/master X-Git-Oldrev: 723ef5a937dbab5e7a35761fd7f0ff0c76849340 X-Git-Newrev: 34b9a03353d3fdc5c57f2708469d0df78c6d6508 Message-Id: <20220912094231.F1874385C300@sourceware.org> Date: Mon, 12 Sep 2022 09:42:31 +0000 (GMT) List-Id: https://gcc.gnu.org/g:34b9a03353d3fdc5c57f2708469d0df78c6d6508 commit r13-2619-g34b9a03353d3fdc5c57f2708469d0df78c6d6508 Author: Torbjörn SVENSSON Date: Fri Sep 9 12:19:27 2022 +0200 gcov: Respect triplet when looking for gcov 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 Diff: --- 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..b8e9661aa53 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.