[gcc r13-2619] gcov: Respect triplet when looking for gcov
Martin Liska
marxin@gcc.gnu.org
Mon Sep 12 09:42:31 GMT 2022
https://gcc.gnu.org/g:34b9a03353d3fdc5c57f2708469d0df78c6d6508
commit r13-2619-g34b9a03353d3fdc5c57f2708469d0df78c6d6508
Author: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
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 <torbjorn.svensson@foss.st.com>
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.
More information about the Gcc-cvs
mailing list