aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Sandoe <iain@sandoe.co.uk>2018-12-06 08:14:57 +0000
committerIain Sandoe <iains@gcc.gnu.org>2018-12-06 08:14:57 +0000
commitbd38d0da47c238e6660a3d1d8461083abfe23aa2 (patch)
treebab62f993a53300c0cf19892ffbb462361d605d5
parentf3b58759c2517e3e1249ded86c266773d0f32b38 (diff)
downloadgcc-bd38d0da47c238e6660a3d1d8461083abfe23aa2.zip
gcc-bd38d0da47c238e6660a3d1d8461083abfe23aa2.tar.gz
gcc-bd38d0da47c238e6660a3d1d8461083abfe23aa2.tar.bz2
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
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/lib/c-compat.exp12
2 files changed, 17 insertions, 1 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc5d556..d330d0e 100644
--- 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 f021890..45aa80a 100644
--- 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
}