aboutsummaryrefslogtreecommitdiff
path: root/gcc/testsuite/g++.dg/gcov
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2022-11-15 21:11:54 +0100
committerHans-Peter Nilsson <hp@bitrange.com>2022-11-16 18:19:17 +0100
commite91d51457532da6c2179b23359435f06d89488e7 (patch)
tree261ba7e78acb6f3158119e5497e62fd578171f67 /gcc/testsuite/g++.dg/gcov
parent246bbdaa5f536b7a199dda9860c473137f40d622 (diff)
downloadgcc-e91d51457532da6c2179b23359435f06d89488e7.zip
gcc-e91d51457532da6c2179b23359435f06d89488e7.tar.gz
gcc-e91d51457532da6c2179b23359435f06d89488e7.tar.bz2
testsuite: Fix mistransformed gcov
In commit r13-2619-g34b9a03353d3fd, [transform] was applied to all invocations of gcov, for both out-of-tree and in-tree testing. For in-tree cross builds, this means gcov was called as "/path/to/gccobj/gcc/target-tuple-gcov" gcov-pr94029.c which is incorrect, as it's there "/path/to/gccobj/gcc/gcov" until it's installed. This caused a testsuite failure, like: Running /x/gcc/gcc/testsuite/gcc.misc-tests/gcov.exp ... FAIL: gcc.misc-tests/gcov-pr94029.c gcov failed: spawn failed To avoid cumbersome conditionals, use a dedicated new helper function. gcc/testsuite: * lib/gcc-dg.exp (gcc-transform-out-of-tree): New proc. * g++.dg/gcov/gcov.exp, gcc.misc-tests/gcov.exp: Call gcc-transform-out-of-tree instead of transform.
Diffstat (limited to 'gcc/testsuite/g++.dg/gcov')
-rw-r--r--gcc/testsuite/g++.dg/gcov/gcov.exp4
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/testsuite/g++.dg/gcov/gcov.exp b/gcc/testsuite/g++.dg/gcov/gcov.exp
index 04e7a01..def827d 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]]/[transform gcov]
+ set GCOV [file dirname [lindex $GXX_UNDER_TEST 0]]/[gcc-transform-out-of-tree gcov]
} else {
- set GCOV [transform gcov]
+ set GCOV [gcc-transform-out-of-tree gcov]
}
# Initialize harness.