git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prune.exp (escape_regex_chars): New. 

2016-03-29  Zachary T Welch <zwelch@codesourcery.com>

	* lib/prune.exp (escape_regex_chars): New.
	(prune_file_path): Update to quote metcharacters for regexp.

From-SVN: r234533
This commit is contained in:
Zachary T Welch 2016-03-29 19:56:35 +00:00 committed by Mike Stump
parent f8a1abf8e3
commit 13f0e8c7e7
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2016-03-29 Zachary T Welch <zwelch@codesourcery.com>
* lib/prune.exp (escape_regex_chars): New.
(prune_file_path): Update to quote metcharacters for regexp.
2016-03-29 Jakub Jelinek <jakub@redhat.com> 2016-03-29 Jakub Jelinek <jakub@redhat.com>
PR rtl-optimization/70429 PR rtl-optimization/70429

25
gcc/testsuite/lib/prune.exp
View File

@ -78,12 +78,33 @@ proc prune_gcc_output { text } {
return $text return $text
} }
# escape metacharacters in literal string, so it can be used in regex
proc escape_regex_chars { line } {
return [string map {"^" "\\^"
"$" "\\$"
"(" "\\("
")" "\\)"
"[" "\\["
"]" "\\]"
"{" "\\{"
"}" "\\}"
"." "\\."
"\\" "\\\\"
"?" "\\?"
"+" "\\+"
"*" "\\*"
"|" "\\|"} $line]
}
proc prune_file_path { text } { proc prune_file_path { text } {
global srcdir global srcdir
set safedir [escape_regex_chars $srcdir]
regsub -all "$safedir\/" $text "" text
# Truncate absolute file path into relative path. # Truncate absolute file path into relative path.
set topdir "[file dirname [file dirname [file dirname $srcdir]]]" set topdir "[file dirname [file dirname [file dirname $safedir]]]"
regsub -all "$srcdir\/" $text "" text
regsub -all "$topdir\/" $text "" text regsub -all "$topdir\/" $text "" text
return $text return $text