gdb: Make test names unique in gdb.base/maint.exp

Add prefixes or suffixes to some test names to make them unique.

Replace a send_gdb/gdb_expect with a gdb_test, and make the test name
unique.

Remove test of 'help maint' as this is already covered by a later call
to test_prefix_command_help.

Removed test of 'help maint info' and add a new call to
test_prefix_command_help instead.

gdb/testsuite/ChangeLog:

	* gdb.base/maint.exp: Make test names unique, use
	test_prefix_command_help to test 'help maint info', and remove
	repeated test of 'help maint'.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 62fa5e03c8f7e90ec7d106ac852846174c87bd2b..66e0ce0de401e05caea954ca2db545be02c0b301 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2018-05-04  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * gdb.base/maint.exp: Make test names unique, use
+       test_prefix_command_help to test 'help maint info', and remove
+       repeated test of 'help maint'.
+
 2018-05-04  Tom Tromey  <tom@tromey.com>
 
        PR gdb/22619:

diff --git a/gdb/testsuite/gdb.base/maint.exp b/gdb/testsuite/gdb.base/maint.exp
index f576cb384025ca3673f89b543a5a6e571c08dbff..aefaeb01387eb5bc07641107cd5bdeb746823742 100644 (file)
--- a/gdb/testsuite/gdb.base/maint.exp
+++ b/gdb/testsuite/gdb.base/maint.exp
@@ -261,7 +261,7 @@ if { ! $have_gdb_index } {
                                timeout { fail "$test_name (timeout)" }
                            }
                            gdb_test "shell rm -f $psymbols_output" ".*" \
-                               "shell rm -f psymbols_output"
+                               "${test_name}: shell rm -f psymbols_output"
                        }
                        -re ".*$gdb_prompt $" { fail "$test_name" }
                        timeout { fail "$test_name (timeout)" }
@@ -282,14 +282,9 @@ gdb_expect  {
        send_gdb "shell ls $msymbols_output\n"
        gdb_expect {
            -re "$msymbols_output_re\r\n$gdb_prompt $" {
-               send_gdb "shell grep factorial $msymbols_output\n"
-               gdb_expect {
-                   -re "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*$gdb_prompt $" {
-                       pass "maint print msymbols"
-                   }
-                   -re ".*$gdb_prompt $" { fail "maint print msymbols" }
-                   timeout { fail "maint print msymbols (timeout)" }
-               }
+               gdb_test "shell grep factorial $msymbols_output" \
+                   "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
+                   "maint print msymbols, absolute pathname"
                gdb_test "shell rm -f $msymbols_output" ".*" \
                    "shell rm -f msymbols_output"
            }
@@ -313,7 +308,7 @@ gdb_test_multiple "maint print msymbols -objfile ${testfile} msymbols_output2" "
            -re "msymbols_output2\r\n$gdb_prompt $" {
                gdb_test "shell grep factorial msymbols_output2" \
                    "\\\[ *$decimal\\\] \[tT\]\[ \t\]+$hex \\.?factorial.*" \
-                   "maint print msymbols"
+                   "maint print msymbols, relative pathname"
                gdb_test "shell rm -f msymbols_output2" ".*"
            }
        }
@@ -352,7 +347,7 @@ foreach { test_name command } $test_list {
                        timeout { fail "$test_name (timeout)" }
                    }
                    gdb_test "shell rm -f $symbols_output" ".*" \
-                       "shell rm -f symbols_output"
+                       "$test_name: shell rm -f symbols_output"
                }
                -re ".*$gdb_prompt $" { fail "$test_name" }
                timeout { fail "$test_name (timeout)" }
@@ -533,11 +528,9 @@ set timeout $oldtimeout
 
 #============test help on maint commands
 
-gdb_test "help maint" \
-    "Commands for use by GDB maintainers\\..*Includes commands to dump specific internal GDB structures in.*a human readable form, to cause GDB to deliberately dump core, etc\\..*List of maintenance subcommands:.*maintenance info.*maintenance internal-error.*maintenance print.*maintenance set.*maintenance show.*Type.*help maintenance.*followed by maintenance subcommand name for full documentation\\..*Command name abbreviations are allowed if unambiguous\\..*" 
-
-gdb_test "help maint info" \
-    "Commands for showing internal info about the program being debugged.*unambiguous\\..*"
+test_prefix_command_help {"maint info" "maintenance info"} {
+    "Commands for showing internal info about the program being debugged\\.\[\r\n\]+"
+}
 
 test_prefix_command_help {"maint print" "maintenance print"} {
     "Maintenance command for printing GDB internal state\\.\[\r\n\]+"