[PATCH][dejagnu] truncate absolute file path into relative for dg-output

  gcc/testsuite/
    * lib/gcc-dg.exp (${tool}_load): Truncate gcc output.
    * lib/prune.exp (prune_gcc_output): New absolute path to relative path
    truncation pattern.

From-SVN: r217408

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a0dfed8bfd8ee9e10f6d3781db6fba2b8410c74..1cb9e1cc36f21e671cde3bf6442eb7f5b5193fc5 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-12  Jiong Wang  <jiong.wang@arm.com>
+
+       * lib/gcc-dg.exp (${tool}_load): Truncate gcc output.
+       * lib/prune.exp (prune_gcc_output): New absolute path to relative path
+       truncation pattern.
+
 2014-11-12  Andreas Tobler  <andreast@gcc.gnu.org>
 
        * gcc.target/arm/eabi1.c: Replace arm*-*-*eabi* and arm*-*-symbianelf*

diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp
index a0d1e7ddde9e8211541eb6b3635c8c48b20c9193..8168a77a441d31f32d702fd2a8db11d7f91cbea5 100644 (file)
--- a/gcc/testsuite/lib/gcc-dg.exp
+++ b/gcc/testsuite/lib/gcc-dg.exp
@@ -281,6 +281,8 @@ 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]]]
        return $result
     }
 }

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 859d25ef8015c4fca74be60d79e4dadab81b57e4..65028c21190ac4b71b39aaa61cf0a7e0a284d3f5 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -22,6 +22,8 @@ if ![info exists TEST_ALWAYS_FLAGS] {
 set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret -fdiagnostics-color=never $TEST_ALWAYS_FLAGS"
 
 proc prune_gcc_output { text } {
+    global srcdir
+
     #send_user "Before:$text\n"
 
     regsub -all "(^|\n)(\[^\n\]*: )?In ((static member |lambda )?function|member|method|(copy )?constructor|destructor|instantiation|substitution|program|subroutine|block-data)\[^\n\]*" $text "" text
@@ -66,6 +68,11 @@ 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
 
+    # 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