espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-19 17:18:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

testsuite: prune DOS drive letter in test outputs

Browse Source 
On DOS systems, absolute paths start with the drive letter. This can
trigger failures in the regexp from dump tests, especially for those
checking for warnings or errors. They are usually skipping everything
before the first ":" as it has to be the file path.
  | [^:]*: warning: ...

In order to avoid modifying many regexps to allow such drive letters,
prune them from all the outputs if they are found at the beginning of
a line.

binutils/ChangeLog:

	* testsuite/lib/binutils-common.exp (prune_dump_output): New
	(run_dump_test): Use it.

ld/ChangeLog:

	* testsuite/ld-elf/noinit-sections-2.l: Remove DOS drive letter
	handler.
This commit is contained in:
Clément Chigot
2023-02-21 15:07:58 +01:00
parent ae9a0a51e8
commit 2b69325792
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
binutils/testsuite/lib/binutils-common.exp
View File

@ -687,6 +687,22 @@ if ![string length [info proc prune_warnings]] {
}
}
# prune_dump_output OUTPUT
#
# Clean up the output from system specific or unwanted characters.
# This allows to simplify the regexp inside dump tests.
proc prune_dump_output { output } {
if [ishost "*-*-mingw*"] {
# Prune DOS drive letter from an absolute path if it appears
# at the beginning of a line.
regsub -all {(^|\n)[[:alpha:]]:(/|\\)} $output "\\1\\2" output
}
# Prune last end of line.
regsub "\n$" $output "" output
return $output
}
# run_dump_test FILE (optional:) EXTRA_OPTIONS
#
# Assemble a .s file, then run some utility on it and check the output.
@ -1450,7 +1466,7 @@ proc run_dump_test { name {extra_options {}} } {
}
}
regsub "\n$" $comp_output "" comp_output
set comp_output [prune_dump_output $comp_output]
if { $cmdret != 0 || $comp_output != "" || $want_out(source) != "" } {
set exitstat "succeeded"
if { $cmdret != 0 } { set exitstat "failed" }

4
ld/testsuite/ld-elf/noinit-sections-2.l
View File

@ -1,5 +1,5 @@
#...
(|.:)[^:]*: warning: orphan section `.noinit.var_noinit' from \S+ being placed in section `.noinit.var_noinit'
[^:]*: warning: orphan section `.noinit.var_noinit' from \S+ being placed in section `.noinit.var_noinit'
#...
(|.:)[^:]*: warning: orphan section `.gnu.linkonce.n.var_noinit2' from \S+ being placed in section `.gnu.linkonce.n.var_noinit2'
[^:]*: warning: orphan section `.gnu.linkonce.n.var_noinit2' from \S+ being placed in section `.gnu.linkonce.n.var_noinit2'
#pass