gdb.base/sym-file.exp: clean up test messages a bit.

Remove regex characters from test message, and don't refer to
breakpoint numbers in test messages (subsequent patches will add more
breakpoints, changing these numbers).  Result:

 -PASS: gdb.base/sym-file.exp: add-symbol-file .*sym-file-lib\.so addr
 +PASS: gdb.base/sym-file.exp: add-symbol-file sym-file-lib.so addr

 -PASS: gdb.base/sym-file.exp: check if Breakpoint 2 is pending.
 -PASS: gdb.base/sym-file.exp: check if Breakpoint 3 is pending.
 +PASS: gdb.base/sym-file.exp: breakpoint at foo is pending
 +PASS: gdb.base/sym-file.exp: breakpoint at bar is pending

gdb/testsuite/
2014-04-15  Pedro Alves <palves@redhat.com>

	* gdb.base/sym-file.exp: Remove regex characters from test
	message.  Don't refer to breakpoint numbers in test messages.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 4ead639aa961faa9ccdb2eecb707d01dc11f9615..0d773b67ee06ff197631c3db684fb893e7d15bb0 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-15  Pedro Alves <palves@redhat.com>
+
+       * gdb.base/sym-file.exp: Remove regex characters from test
+       message.  Don't refer to breakpoint numbers in test messages.
+
 2014-04-14  Keith Seitz  <keiths@redhat.com>
 
        PR c++/16253

diff --git a/gdb/testsuite/gdb.base/sym-file.exp b/gdb/testsuite/gdb.base/sym-file.exp
index 5d19f3b5d6fedb67fbfd94f5e2fe8d3536c3c07c..9ee12e5534c0369f05c90cc33be6a9683c0c5a61 100644 (file)
--- a/gdb/testsuite/gdb.base/sym-file.exp
+++ b/gdb/testsuite/gdb.base/sym-file.exp
@@ -89,7 +89,7 @@ if {!$result} then {
 # 3) Add $shlib_name using 'add-symbol-file'.
 set result [gdb_test "add-symbol-file ${shlib_name} addr" \
                     "Reading symbols from .*${lib_basename}\\.so\\.\\.\\.done\\." \
-                    "add-symbol-file .*${lib_basename}\\.so addr" \
+                    "add-symbol-file ${lib_basename}.so addr" \
                     "add symbol table from file \".*${lib_basename}\\.so\"\
  at.*\\(y or n\\) " \
                     "y"]
@@ -148,11 +148,11 @@ gdb_test "info files" \
 #     $shlib_name.
 gdb_test "info breakpoints 2" \
         ".*PENDING.*" \
-        "check if Breakpoint 2 is pending."
+        "breakpoint at foo is pending"
 
 gdb_test "info breakpoints 3" \
         ".*PENDING.*" \
-        "check if Breakpoint 3 is pending."
+        "breakpoint at bar is pending"
 
 # 13) Check that the execution can continue without error.
 gdb_continue_to_end