* lib/gdb.exp (using_fission): New proc.

	* gdb.base/info-macros.exp: Skip test if using Fission.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b4d98aa9521de9e16dd1aace83003c234b431afa..328bdf372f9b3208f1fac852782987c74d2934bd 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 2013-09-16  Doug Evans  <dje@google.com>
 
+       * lib/gdb.exp (using_fission): New proc.
+       * gdb.base/info-macros.exp: Skip test if using Fission.
+
        * gdb.base/break-interp.exp: Fix indentation.
 
 2013-09-16  Sergio Durigan Junior  <sergiodj@redhat.com>

diff --git a/gdb/testsuite/gdb.base/info-macros.exp b/gdb/testsuite/gdb.base/info-macros.exp
index ed750c1eec551cac97f8e05dd3dbb0ef96a84400..46861769b219b6b7bd05b0af182af9adc8b6159c 100644 (file)
--- a/gdb/testsuite/gdb.base/info-macros.exp
+++ b/gdb/testsuite/gdb.base/info-macros.exp
@@ -15,6 +15,12 @@
 
 standard_testfile .c
 
+# Fission doesn't support macros yet.  Bug 15954.
+if [using_fission] {
+    untested ${testfile}.exp
+    return -1
+}
+
 get_compiler_info
 if ![test_compiler_info gcc*] {
   untested ${testfile}.exp

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 9b319e235331ac078741a8dc8d31193497e16f9d..05e66eff1c42a1e25fb1d61a1ae06c246d08e5da 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -4473,5 +4473,15 @@ proc run_on_host { test program args } {
     }
 }
 
+# Return non-zero if "board_info debug_flags" mentions Fission.
+# http://gcc.gnu.org/wiki/DebugFission
+# Fission doesn't support everything yet.
+# This supports working around bug 15954.
+
+proc using_fission { } {
+    set debug_flags [board_info [target_info name] debug_flags]
+    return [regexp -- "-gsplit-dwarf" $debug_flags]
+}
+
 # Always load compatibility stuff.
 load_lib future.exp