mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-04 08:40:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

testsuite: Fix mistransformed gcov

Browse Source 
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.
This commit is contained in:
Hans-Peter Nilsson 2022-11-15 21:11:54 +01:00 committed by Hans-Peter Nilsson
parent 246bbdaa5f
commit e91d514575
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/testsuite/g++.dg/gcov/gcov.exp
View File

@ -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.

4
gcc/testsuite/gcc.misc-tests/gcov.exp
View File

@ -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]]/[transform gcov]
set GCOV [file dirname [lindex $GCC_UNDER_TEST 0]]/[gcc-transform-out-of-tree gcov]
} else {
set GCOV [transform gcov]
set GCOV [gcc-transform-out-of-tree gcov]
}
# Initialize harness.

13
gcc/testsuite/lib/gcc-dg.exp
View File

@ -1429,5 +1429,18 @@ proc scan-symbol-not { args } {
}
}
# Transform a tool-name to its canonical-target-name by "transform"
# (which may return the original name for native targets) but only if
# testing out-of-tree. When in-tree, the tool is expected to be found
# by its original name, typically with some build-directory prefix
# prepended by the caller.
proc gcc-transform-out-of-tree { args } {
global TESTING_IN_BUILD_TREE
if { [info exists TESTING_IN_BUILD_TREE] } {
return $args;
}
return [transform $args]
}
set additional_prunes ""
set dg_runtest_extra_prunes ""