diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/maint.exp | 20 |
2 files changed, 10 insertions, 16 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fff79c2..e63f2b7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-12-02 Luis Machado <lgustavo@codesourcery.com> + + * gdb.base/maint.exp: Use gdb_test instead of gdb_test_multiple when + possible. + Remove useless pattern-matching code. + 2016-12-02 Pedro Alves <palves@redhat.com> * gdb.base/commands.exp (user_defined_command_manyargs_test): New diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp index 17c606b..c66c9ed 100644 --- a/gdb/testsuite/gdb.base/maint.exp +++ b/gdb/testsuite/gdb.base/maint.exp @@ -290,25 +290,13 @@ gdb_test_multiple "maint print msymbols msymbols_output2 ${testfile}" "maint pri -re "^maint print msymbols msymbols_output2 \[^\n\]*\r\n$gdb_prompt $" { gdb_test_multiple "shell ls msymbols_output2" "maint print msymbols" { -re "msymbols_output2\r\n$gdb_prompt $" { - gdb_test_multiple "shell grep factorial msymbols_output2" "maint print msymbols" { - -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*$gdb_prompt $" { - pass "maint print msymbols" - } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" - } - } - gdb_test "shell rm -f msymbols_output2" ".*" \ - "shell rm -f msymbols_output2" - } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" + gdb_test "shell grep factorial msymbols_output2" \ + "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \ + "maint print msymbols" + gdb_test "shell rm -f msymbols_output2" ".*" } } } - -re ".*$gdb_prompt $" { - fail "maint print msymbols" - } } gdb_test "cd ${mydir}" \ "Working directory [string_to_regexp ${mydir}]\..*" \ |