Patchwork Caret diagnostics

login
register
mail settings
Submitter Manuel López-Ibáñez
Date April 11, 2012, 8:28 p.m.
Message ID <CAESRpQDNd+1_GSuGjfp5z9QvHgOH+gZUhMVdjS3Ru1U5aiWiOw@mail.gmail.com>
Download mbox | patch
Permalink /patch/151875/
State New
Headers show

Comments

Manuel López-Ibáñez - April 11, 2012, 8:28 p.m.
On 11 April 2012 18:40, H.J. Lu <hjl.tools@gmail.com> wrote:
>
> It breaks library tests:
>
> ERROR: tcl error sourcing
> ../../../../src-trunk/boehm-gc/testsuite/../../gcc/testsuite/lib/prune.exp.
> ERROR: tcl error sourcing
> ../../../../src-trunk/libgomp/testsuite/../../gcc/testsuite/lib/prune.exp.
> ERROR: tcl error sourcing
>

Hopefully fixed by this patch:

Committed after testing as revision 186353.

Cheers,

Manuel.

Patch

Index: libgomp/ChangeLog
===================================================================
--- libgomp/ChangeLog   (revision 186352)
+++ libgomp/ChangeLog   (revision 186353)
@@ -1,3 +1,7 @@ 
+2012-04-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * testsuite/lib/libgomp.exp: Add -fno-diagnostics-show-caret.
+
 2012-03-31  H.J. Lu  <hongjiu.lu@intel.com>

        PR bootstrap/52812
Index: libgomp/testsuite/lib/libgomp.exp
===================================================================
--- libgomp/testsuite/lib/libgomp.exp   (revision 186352)
+++ libgomp/testsuite/lib/libgomp.exp   (revision 186353)
@@ -161,6 +161,9 @@ 
     # error-message parsing machinery.
     lappend ALWAYS_CFLAGS "additional_flags=-fmessage-length=0"

+    # Disable caret
+    lappend ALWAYS_CFLAGS "additional_flags=-fno-diagnostics-show-caret"
+
     # And, gee, turn on OpenMP.
     lappend ALWAYS_CFLAGS "additional_flags=-fopenmp"
 }
Index: gcc/testsuite/lib/prune.exp
===================================================================
--- gcc/testsuite/lib/prune.exp (revision 186352)
+++ gcc/testsuite/lib/prune.exp (revision 186353)
@@ -17,6 +17,9 @@ 

 # Prune messages from gcc that aren't useful.

+if ![info exists TEST_ALWAYS_FLAGS] {
+    set TEST_ALWAYS_FLAGS ""
+}
 set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret $TEST_ALWAYS_FLAGS"

 proc prune_gcc_output { text } {
Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog     (revision 186352)
+++ gcc/testsuite/ChangeLog     (revision 186353)
@@ -1,3 +1,7 @@ 
+2012-04-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>
+
+       * lib/prune.exp (TEST_ALWAYS_FLAGS): If undefined, set to empty.
+
 ../../../../src-trunk/libitm/testsuite/../../gcc/testsuite/lib/prune.exp.