diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2020-01-17 09:30:17 +0100 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2020-01-17 09:33:06 +0100 |
| commit | 40111910b0aa897b3e4c8d60c0c263e5c1a50446 (patch) | |
| tree | 52d9b540c70edc341c59a4706477ac1d8fd62639 /gcc | |
| parent | 2b3534a3122236d6317256f16daa332278391907 (diff) | |
| download | gcc-40111910b0aa897b3e4c8d60c0c263e5c1a50446.zip gcc-40111910b0aa897b3e4c8d60c0c263e5c1a50446.tar.gz gcc-40111910b0aa897b3e4c8d60c0c263e5c1a50446.tar.bz2 | |
testsuite: Unbreak compat.exp testing with alt compiler PR93294
2020-01-17 Jakub Jelinek <jakub@redhat.com>
PR testsuite/93294
* lib/c-compat.exp (compat-use-alt-compiler): Handle
-fdiagnostics-urls=never similarly to -fdiagnostics-color=never.
(compat_setup_dfp): Likewise.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/testsuite/lib/c-compat.exp | 10 |
2 files changed, 17 insertions, 0 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 6fa2e15..eea3bd2 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2020-01-17 Jakub Jelinek <jakub@redhat.com> + + PR testsuite/93294 + * lib/c-compat.exp (compat-use-alt-compiler): Handle + -fdiagnostics-urls=never similarly to -fdiagnostics-color=never. + (compat_setup_dfp): Likewise. + 2020-01-16 Kerem Kat <keremkat@gmail.com> PR c/92833 diff --git a/gcc/testsuite/lib/c-compat.exp b/gcc/testsuite/lib/c-compat.exp index 3b94b88..9493c21 100644 --- a/gcc/testsuite/lib/c-compat.exp +++ b/gcc/testsuite/lib/c-compat.exp @@ -36,6 +36,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 compat_no_line_no + global compat_alt_urls global TEST_ALWAYS_FLAGS # We don't need to do this if the alternate compiler is actually @@ -48,6 +49,9 @@ proc compat-use-alt-compiler { } { if { $compat_alt_color == 0 } then { regsub -- "-fdiagnostics-color=never" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS } + if { $compat_alt_urls == 0 } then { + regsub -- "-fdiagnostics-urls=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 } @@ -80,11 +84,13 @@ proc compat_setup_dfp { } { global compat_have_dfp global compat_alt_caret global compat_alt_color + global compat_alt_urls 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_alt_urls 0 set compat_no_line_no 0 set compat_save_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS @@ -105,6 +111,10 @@ proc compat_setup_dfp { } { int dummy; } "-fdiagnostics-color=never"] != 0 } { set compat_alt_color 1 } + if { [check_no_compiler_messages_nocache compat_alt_has_urls object { + int dummy; } "-fdiagnostics-urls=never"] != 0 } { + set compat_alt_urls 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 |