This is the mail archive of the mailing list for the Archer project.

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[jankratochvil-misc] [commit] Fix FAIL on gdb.cp/expand-sals.exp[misc] x [keiths-expr-cumulative].

commit faf81bd1827c1405b4f5218bfbe75f98d6de1cb5

[keiths-expr-cumulative] (its [swagiaal-using-directive] part?) now prints
fully-qualified constructor names.


	* gdb.cp/expand-sals.exp (bt from A, bt from B before the call): Accept
	also fully-qualified constructor names.
 gdb/testsuite/gdb.cp/expand-sals.exp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.cp/expand-sals.exp b/gdb/testsuite/gdb.cp/expand-sals.exp
index a2631fb..6e04cbf 100644
--- a/gdb/testsuite/gdb.cp/expand-sals.exp
+++ b/gdb/testsuite/gdb.cp/expand-sals.exp
@@ -77,7 +77,7 @@ gdb_continue_to_breakpoint "caller" ".*caller-line.*"
 # Test GDB caught this return call and not the next one through B::B()
 gdb_test "bt" \
-	 "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* main \[^\r\n\]*" \
+	 "#0 \[^\r\n\]* (A::)?A \[^\r\n\]*\r\n#1 \[^\r\n\]* main \[^\r\n\]*" \
 	 "bt from A"
 gdb_continue_to_breakpoint "next caller instance" ".*caller-line.*"
@@ -89,7 +89,7 @@ gdb_continue_to_breakpoint "next caller instance" ".*caller-line.*"
 # case, expecting here to catch the breakpoint before the call happens.
 gdb_test "bt" \
-	 "#0 \[^\r\n\]* A \[^\r\n\]*\r\n#1 \[^\r\n\]* B \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*" \
+	 "#0 \[^\r\n\]* (A::)?A \[^\r\n\]*\r\n#1 \[^\r\n\]* (B::)?B \[^\r\n\]*\r\n#2 \[^\r\n\]* main \[^\r\n\]*" \
 	 "bt from B before the call"
 gdb_continue_to_breakpoint "next caller func" ".*func-line.*"

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]