diff options
Diffstat (limited to 'gdb/testsuite/gdb.cp')
| -rw-r--r-- | gdb/testsuite/gdb.cp/cp-relocate.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/cplusfuncs.exp | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/namespace.exp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/gdb/testsuite/gdb.cp/cp-relocate.exp b/gdb/testsuite/gdb.cp/cp-relocate.exp index e48eb8c..63d2ad4 100644 --- a/gdb/testsuite/gdb.cp/cp-relocate.exp +++ b/gdb/testsuite/gdb.cp/cp-relocate.exp @@ -56,11 +56,11 @@ gdb_file_cmd ${binfile} set func1_name "" set func2_name "" gdb_test_multiple "info functions func<.>" "info functions" { - -re "\r\nint (\[^\r\]*func<1>\[^\r]*);" { + -re "\tint (\[^\r\]*func<1>\[^\r]*);" { set func1_name $expect_out(1,string) exp_continue } - -re "\r\nint (\[^\r\]*func<2>\[^\r]*);" { + -re "\tint (\[^\r\]*func<2>\[^\r]*);" { set func2_name $expect_out(1,string) exp_continue } diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp index 6f6b425..f80790c 100644 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp @@ -292,7 +292,7 @@ proc info_func_regexp { name demangled } { regsub {\\\(void\\\)} $demangled {\(\)} demangled gdb_test "info function $name" \ - "File .*:\r\n(class|)${demangled}.*" \ + "File .*:\t(class|)${demangled}.*" \ "info function for \"$name\"" } diff --git a/gdb/testsuite/gdb.cp/namespace.exp b/gdb/testsuite/gdb.cp/namespace.exp index 958ee0e..b0511b1 100644 --- a/gdb/testsuite/gdb.cp/namespace.exp +++ b/gdb/testsuite/gdb.cp/namespace.exp @@ -95,10 +95,10 @@ gdb_test_multiple "ptype ina" "ptype ina" { setup_xfail hppa*-*-*11* CLLbs14869 gdb_test_multiple "info func xyzq" "info func xyzq" { - -re "All functions.*File.*namespace.cc:\r\nint AAA::A_xyzq\\(int\\);\r\nint BBB::B_xyzq\\(int\\);\r\nchar AAA::xyzq\\(char\\);\r\nchar BBB::xyzq\\(char\\);\r\nchar BBB::CCC::xyzq\\(char\\);\r\nchar BBB::Class::xyzq\\(char\\);\r\n$gdb_prompt $" { + -re "All functions.*File.*namespace.cc:\r\n.*\tint AAA::A_xyzq\\(int\\);\r\n.*\tint BBB::B_xyzq\\(int\\);\r\n.*\tchar AAA::xyzq\\(char\\);\r\n.*\tchar BBB::xyzq\\(char\\);\r\n.*\tchar BBB::CCC::xyzq\\(char\\);\r\n.*\tchar BBB::Class::xyzq\\(char\\);\r\n$gdb_prompt $" { pass "info func xyzq" } - -re "All functions.*File.*namespace.cc:\r\nint AAA::A_xyzq\\(int\\);\r\nchar AAA::xyzq\\(char\\);\r\nint BBB::B_xyzq\\(int\\);\r\nchar BBB::CCC::xyzq\\(char\\);\r\nchar BBB::Class::xyzq\\(char\\);\r\nchar BBB::xyzq\\(char\\);\r\n$gdb_prompt $" { + -re "All functions.*File.*namespace.cc:\r\n.*\tint AAA::A_xyzq\\(int\\);\r\n.*\tchar AAA::xyzq\\(char\\);\r\n.*\tint BBB::B_xyzq\\(int\\);\r\n.*\tchar BBB::CCC::xyzq\\(char\\);\r\n.*\tchar BBB::Class::xyzq\\(char\\);\r\n.*\tchar BBB::xyzq\\(char\\);\r\n$gdb_prompt $" { pass "info func xyzq" } } |