* gdb.base/maint.exp: Fix test for "mt expand-symtabs" to account for

	-fdebug-types-section.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f944fc4e2e6d636f9a14b753e9fcc915b4274722..1c02b694a63feed15a0c4d3f8318ab2a69334cd3 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-20  Doug Evans  <dje@google.com>
+
+       * gdb.base/maint.exp: Fix test for "mt expand-symtabs" to account for
+       -fdebug-types-section.
+
 2013-05-20  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.ada/float_param: New testcase.

diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index 96090387165b861b9ea8855a2e6f7a6e75e95625..260818e6383aeab66d922dbb4d4889f142526092 100644 (file)
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -89,8 +89,11 @@ gdb_test "maint print registers" "Name.*Nr.*Rel.*Offset.*Size.*Type.*"
 gdb_test_no_output "mt set per on" "mt set per on for expand-symtabs"
 gdb_test_multiple "mt expand-symtabs $subdir/break\[.\]c$" \
     "mt expand-symtabs" {
-       -re "#primary symtabs: 1 \\(\[+\]1\\),.*$gdb_prompt $" {
-           # This should expand exactly one (primary) symtab.
+       -re "#primary symtabs: (1|2) \\(\[+\](1|2)\\),.*$gdb_prompt $" {
+           # This should expand one or at most two primary symtabs.
+           # "Normally" it will expand just the one for break.c, but if the
+           # file is compiled with -fdebug-types-section then a second primary
+           # symtab for break.c will be created for any types.
            pass "mt expand-symtabs"
        }
     }