testsuite - handle the -fno-diagnostics-show-line-numbers in compat tests.

2018-12-06  Iain Sandoe  <iain@sandoe.co.uk>

	* lib/c-compat.exp (compat-use-alt-compiler):
	Handle -fno-diagnostics-show-line-numbers.
	(compat_setup_dfp): Likewise.

From-SVN: r266840

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc5d556eeca73745fdc5d195958718140c09d1a2..d330d0eaba6a2ce5c11a1cc97048724983835c3a 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-12-06  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * lib/c-compat.exp (compat-use-alt-compiler):
+       Handle -fno-diagnostics-show-line-numbers.
+       (compat_setup_dfp): Likewise.
+
 2018-12-05  Jeff Law  <law@redhat.com>
 
        PR rtl-optimization/85770

diff --git a/gcc/testsuite/lib/c-compat.exp b/gcc/testsuite/lib/c-compat.exp
index f02189024e667775dfbafde1df5ae7f997807be4..45aa80afa4c3683e31b0ee7418ad6c6f5459f95b 100644 (file)
--- a/gcc/testsuite/lib/c-compat.exp
+++ b/gcc/testsuite/lib/c-compat.exp
@@ -35,7 +35,7 @@ load_lib target-libpath.exp
 # 
 proc compat-use-alt-compiler { } {
     global GCC_UNDER_TEST ALT_CC_UNDER_TEST
-    global compat_same_alt compat_alt_caret compat_alt_color
+    global compat_same_alt compat_alt_caret compat_alt_color compat_no_line_no
     global TEST_ALWAYS_FLAGS
 
     # We don't need to do this if the alternate compiler is actually
@@ -48,6 +48,9 @@ proc compat-use-alt-compiler { } {
        if { $compat_alt_color == 0 } then {
            regsub -- "-fdiagnostics-color=never" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS
        }
+       if { $compat_no_line_no == 0 } then {
+           regsub -- "-fno-diagnostics-show-line-numbers" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS
+       }
        restore_gcc_exec_prefix_env_var
     }
 }
@@ -77,10 +80,12 @@ proc compat_setup_dfp { } {
     global compat_have_dfp
     global compat_alt_caret
     global compat_alt_color
+    global compat_no_line_no
     global TEST_ALWAYS_FLAGS compat_save_TEST_ALWAYS_FLAGS
 
     set compat_alt_caret 0
     set compat_alt_color 0
+    set compat_no_line_no 0
     set compat_save_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS
 
     verbose "compat_setup_dfp: $compat_use_alt $compat_same_alt" 2
@@ -100,6 +105,11 @@ proc compat_setup_dfp { } {
                int dummy; } "-fdiagnostics-color=never"] != 0 } {
            set compat_alt_color 1
        }
+       if { [check_no_compiler_messages_nocache compat_alt_has_no_line_no object {
+               int dummy; } "-fno-diagnostics-show-line-numbers"] != 0 } {
+           set compat_no_line_no 1
+       }
+       
        compat-use-tst-compiler
     }