prune.exp (TEST_ALWAYS_FLAGS): If undefined, set to empty.

2012-04-11  Manuel López-Ibáñez  <manu@gcc.gnu.org>

testsuite/
	* lib/prune.exp (TEST_ALWAYS_FLAGS): If undefined, set to empty.
libgomp/
	* testsuite/lib/libgomp.exp: Add -fno-diagnostics-show-caret.

From-SVN: r186353

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a22457a1406ca92a60bbc417fe3e5257b4365ce..9b6a2d9b7c04942f0d79437bdbb8f44e555aa29b 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -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.
+
 2012-04-11  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR rtl-optimization/52876

diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index d2ba49e9db04335844002a227d5d99c5344f4ba8..60a4bd4b994fc0c46a721ac21191047e162596c0 100644 (file)
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -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 } {

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 66321424d45b80a3a1ad4bf80c7c33c53be44034..bc6d5c47792846f73631107ca83e5aafb9af2623 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -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

diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp
index 02909f8f2d7f2db806e7ba9be1cc4cf134edd095..cd561bf15766b9b121af1e4d8b4d732c47169bbc 100644 (file)
--- a/libgomp/testsuite/lib/libgomp.exp
+++ b/libgomp/testsuite/lib/libgomp.exp
@@ -161,6 +161,9 @@ proc libgomp_init { args } {
     # 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"
 }