From 107c2d628b924de1854d6d254d60e97e1887ce4a Mon Sep 17 00:00:00 2001 From: Luis Machado Date: Fri, 2 Dec 2016 13:36:15 -0600 Subject: [PATCH] Remove unneeded pattern matching in gdb.base/maint.exp This gets rid of more useless pattern matching cases in gdb.base/maint.exp. gdb/testsuite/ChangeLog: 2016-12-02 Luis Machado * gdb.base/maint.exp: Use gdb_test instead of gdb_test_multiple when possible. Remove useless pattern-matching code. --- gdb/testsuite/ChangeLog | 6 ++++++ 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 fff79c2440..e63f2b79e6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2016-12-02 Luis Machado + + * gdb.base/maint.exp: Use gdb_test instead of gdb_test_multiple when + possible. + Remove useless pattern-matching code. + 2016-12-02 Pedro Alves * 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 17c606b7b1..c66c9ed802 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}]\..*" \ -- 2.34.1