aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-09-03 23:15:03 -0600
committerTom Tromey <tom@tromey.com>2017-09-05 12:08:03 -0600
commit5eb5f85062a3d43bf449ded1b256d761d487f0d6 (patch)
treeccbc1390e1a0e4e012297954fa8277a43d877e13
parentae780a21f25455e4ca4b2fa7e350e7f994e0f198 (diff)
downloadgdb-5eb5f85062a3d43bf449ded1b256d761d487f0d6.zip
gdb-5eb5f85062a3d43bf449ded1b256d761d487f0d6.tar.gz
gdb-5eb5f85062a3d43bf449ded1b256d761d487f0d6.tar.bz2
Don't use -fdiagnostics-color=never for rustc
I noticed that the gdb.rust tests fail because the test suite passes -fdiagnostics-color=never to rustc. This is not a recognized rustc option, and the test suite already handles passing the appropriate option to the Rust compiler. This patch fixes the problem. testsuite/ChangeLog 2017-09-05 Tom Tromey <tom@tromey.com> * lib/gdb.exp (gdb_compile): Don't use universal_compile_options for rust.
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/gdb.exp7
2 files changed, 11 insertions, 1 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index dfb63a3..b3bed5c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-09-05 Tom Tromey <tom@tromey.com>
+
+ * lib/gdb.exp (gdb_compile): Don't use universal_compile_options
+ for rust.
+
2017-09-05 Simon Marchi <simon.marchi@ericsson.com>
* gdb.multi/multi-arch-exec.exp: Test with different
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index c0ecab3..8af1b77 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -3447,7 +3447,12 @@ proc gdb_compile {source dest type options} {
# Add platform-specific options if a shared library was specified using
# "shlib=librarypath" in OPTIONS.
- set new_options [universal_compile_options]
+ if {[lsearch -exact $options rust] != -1} {
+ # -fdiagnostics-color is not a rustcc option.
+ } else {
+ set new_options [universal_compile_options]
+ }
+ set new_options {}
set shlib_found 0
set shlib_load 0
foreach opt $options {