gcc-dg.exp (${tool}_load): Call prune_file_path instead of prune_gcc_output.

* lib/gcc-dg.exp (${tool}_load): Call prune_file_path instead
	of prune_gcc_output.
	* lib/prune.exp (prune_file_path): New procedure.

From-SVN: r217428
This commit is contained in:
Marek Polacek 2014-11-12 15:48:54 +00:00 committed by Marek Polacek
parent 2f68e8bcc0
commit 4feb5dd860
3 changed files with 15 additions and 3 deletions

View File

@ -1,3 +1,9 @@
2014-11-12 Marek Polacek <polacek@redhat.com>
* lib/gcc-dg.exp (${tool}_load): Call prune_file_path instead
of prune_gcc_output.
* lib/prune.exp (prune_file_path): New procedure.
2014-11-12 Marek Polacek <polacek@redhat.com>
* c-c++-common/ubsan/overflow-sub-4.c: New test.

View File

@ -282,7 +282,7 @@ if { [info procs ${tool}_load] != [list] \
set result [list $status [lindex $result 1]]
}
set result [list [lindex $result 0] [prune_gcc_output [lindex $result 1]]]
set result [list [lindex $result 0] [prune_file_path [lindex $result 1]]]
return $result
}
}

View File

@ -68,13 +68,19 @@ proc prune_gcc_output { text } {
# Ignore harmless warnings from Xcode 4.0.
regsub -all "(^|\n)\[^\n\]*ld: warning: could not create compact unwind for\[^\n\]*" $text "" text
#send_user "After:$text\n"
return $text
}
proc prune_file_path { text } {
global srcdir
# Truncate absolute file path into relative path.
set topdir "[file dirname [file dirname [file dirname $srcdir]]]"
regsub -all "$srcdir\/" $text "" text
regsub -all "$topdir\/" $text "" text
#send_user "After:$text\n"
return $text
}