diff options
| author | Ben Cheng <bccheng@android.com> | 2013-08-09 06:06:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-08-09 06:06:51 +0000 |
| commit | db4af57502996870a3d0ef3018d017bf8bb9c069 (patch) | |
| tree | 983eb1a0ad23a97463fdc55aa8a9bfbb6469cd8c /gcc-4.8/gcc/testsuite | |
| parent | 250550fc72aadbc354305eeb148378414c351842 (diff) | |
| parent | b418cc876926be9532aa8ea868186aa92ed462a0 (diff) | |
| download | toolchain_gcc-db4af57502996870a3d0ef3018d017bf8bb9c069.tar.gz toolchain_gcc-db4af57502996870a3d0ef3018d017bf8bb9c069.tar.bz2 toolchain_gcc-db4af57502996870a3d0ef3018d017bf8bb9c069.zip | |
Merge "[4.8] Backport diagnostic color support from trunk"
Diffstat (limited to 'gcc-4.8/gcc/testsuite')
| -rw-r--r-- | gcc-4.8/gcc/testsuite/lib/c-compat.exp | 11 | ||||
| -rw-r--r-- | gcc-4.8/gcc/testsuite/lib/prune.exp | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc-4.8/gcc/testsuite/lib/c-compat.exp b/gcc-4.8/gcc/testsuite/lib/c-compat.exp index 58eaf4d64..b42545dfa 100644 --- a/gcc-4.8/gcc/testsuite/lib/c-compat.exp +++ b/gcc-4.8/gcc/testsuite/lib/c-compat.exp @@ -34,7 +34,7 @@ load_lib target-supports.exp # proc compat-use-alt-compiler { } { global GCC_UNDER_TEST ALT_CC_UNDER_TEST - global compat_same_alt compat_alt_caret + global compat_same_alt compat_alt_caret compat_alt_color global TEST_ALWAYS_FLAGS # We don't need to do this if the alternate compiler is actually @@ -44,6 +44,9 @@ proc compat-use-alt-compiler { } { if { $compat_alt_caret == 0 } then { regsub -- "-fno-diagnostics-show-caret" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS } + if { $compat_alt_color == 0 } then { + regsub -- "-fdiagnostics-color=never" $TEST_ALWAYS_FLAGS "" TEST_ALWAYS_FLAGS + } } } @@ -70,9 +73,11 @@ proc compat_setup_dfp { } { global compat_same_alt global compat_have_dfp global compat_alt_caret + global compat_alt_color global TEST_ALWAYS_FLAGS compat_save_TEST_ALWAYS_FLAGS set compat_alt_caret 0 + set compat_alt_color 0 set compat_save_TEST_ALWAYS_FLAGS $TEST_ALWAYS_FLAGS verbose "compat_setup_dfp: $compat_use_alt $compat_same_alt" 2 @@ -88,6 +93,10 @@ proc compat_setup_dfp { } { int dummy; } "-fno-diagnostics-show-caret"] != 0 } { set compat_alt_caret 1 } + if { [check_no_compiler_messages_nocache compat_alt_has_color object { + int dummy; } "-fdiagnostics-color=never"] != 0 } { + set compat_alt_color 1 + } compat-use-tst-compiler } diff --git a/gcc-4.8/gcc/testsuite/lib/prune.exp b/gcc-4.8/gcc/testsuite/lib/prune.exp index c110fc605..789060865 100644 --- a/gcc-4.8/gcc/testsuite/lib/prune.exp +++ b/gcc-4.8/gcc/testsuite/lib/prune.exp @@ -19,7 +19,7 @@ if ![info exists TEST_ALWAYS_FLAGS] { set TEST_ALWAYS_FLAGS "" } -set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret $TEST_ALWAYS_FLAGS" +set TEST_ALWAYS_FLAGS "-fno-diagnostics-show-caret -fdiagnostics-color=never $TEST_ALWAYS_FLAGS" proc prune_gcc_output { text } { #send_user "Before:$text\n" |