Prevent appending "-g" after "-g3" to compile options in info-macros.exp.

When upstream gcc is given a command line with the "-g" option after
"-g3", it doesn't generate a ".debug_macro" section.  This is because
the last option wins, thus downgrading the debug level again.  Without
any macro debug information in the executable, info-macros.exp
obviously produces many failures.

Since the "-g" option is appended by DejaGnu's target_compile whenever
the "debug" option is set, the fix just removes that option.

gdb/testsuite/ChangeLog:
	* gdb.base/info-macros.exp: Remove "debug" from the compile
	options.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 983ff04af1e3567e6cd96a01dc8b5a43ab1cd581..16d7616e6c12681c3925a7b1007fd8be6c331e62 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-22  Andreas Arnez  <arnez@vnet.linux.ibm.com>
+
+       * gdb.base/info-macros.exp: Remove "debug" from the compile
+       options.
+
 2014-01-17  Iain Buclaw  <ibuclaw@gdcproject.org>
 
        * gdb.dlang/demangle.exp: New file.

diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp
index ff889f4e18b05de1581125a503c217010cbbc752..798d9b57e8e34bd84ffe52931919f00792af7a32 100644 (file)
--- a/gdb/testsuite/gdb.base/info-macros.exp
+++ b/gdb/testsuite/gdb.base/info-macros.exp
@@ -27,7 +27,9 @@ if ![test_compiler_info gcc*] {
   return -1
 }
 
-set options "debug additional_flags=-g3"
+# Don't use "debug" here.  Otherwise "-g" would be appended to the gcc
+# command line, possibly overriding "-g3" (depending on gcc version).
+set options "additional_flags=-g3"
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $options] } {
     untested ${testfile}.exp