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

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cf1107c..1c69805 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,11 @@
 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.
        * c-c++-common/ubsan/overflow-sub-2.c: Adjust dg-output.
        * c-c++-common/ubsan/overflow-int128.c: Likewise.

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index 8168a77..6df8ae1 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -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
     }
 }

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 65028c2..df0e053 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -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
 }