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  <lgustavo@codesourcery.com>

	* gdb.base/maint.exp: Use gdb_test instead of gdb_test_multiple when
	possible.
	Remove useless pattern-matching code.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fff79c2440dd836f392864c319e3efc036fbd153..e63f2b79e6d3e015ded499d1147780f3101a3198 100644 (file)
--- 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 17c606b7b1a2f25dd5dcf24e722487bd44865534..c66c9ed80286ccb089823efd4c8c4fcc7b238e61 100644 (file)
--- 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}]\..*" \