summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-11 20:15:35 +0000
committermanu <manu@138bc75d-0d04-0410-961f-82ee72b054a4>2012-04-11 20:15:35 +0000
commitca3d1b330a873fd6c98f42091bde1475b926fe0e (patch)
treefb7074b834831fa4a7de49094d0c0b689fe0da01
parent7a1c6e9216b045975391c9be2228724997bd218c (diff)
downloadgcc-ca3d1b330a873fd6c98f42091bde1475b926fe0e.tar.gz
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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186353 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/testsuite/ChangeLog4
-rw-r--r--gcc/testsuite/lib/prune.exp3
-rw-r--r--libgomp/ChangeLog4
-rw-r--r--libgomp/testsuite/lib/libgomp.exp3
4 files changed, 14 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a22457a140..9b6a2d9b7c0 100644
--- 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 d2ba49e9db0..60a4bd4b994 100644
--- 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 66321424d45..bc6d5c47792 100644
--- 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 02909f8f2d7..cd561bf1576 100644
--- 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"
}