Merge GDB 7.5.1

gdb/testsuite/gdb.base/call-signal-resume.exp

Index: gdb/testsuite/gdb.base/call-signal-resume.exp
diff --git a/gdb/testsuite/gdb.base/call-signal-resume.exp b/gdb/testsuite/gdb.base/call-signal-resume.exp
index 9c67941bfb3268ba7df4f73f94e29992c4c8e132..2baa3f67992d8af8832e7d4f3aae957483bf8115 100644
--- a/gdb/testsuite/gdb.base/call-signal-resume.exp
+++ b/gdb/testsuite/gdb.base/call-signal-resume.exp
@@ -20,10 +20,6 @@
 # 2) Inferior is stopped at a signal.  Upon resumption it should continue
 #    with that signal, regardless of whatever the hand-called function did.
 
-if $tracelevel then {
-	strace $tracelevel
-}
-
 if [target_info exists gdb,noinferiorio] {
     verbose "Skipping call-signal-resume.exp because of no fileio capabilities."
     continue
@@ -103,7 +99,19 @@ if { "$frame_number" == "" } {
 # Pop the dummy frame.
 gdb_test "frame $frame_number" ".*"
 gdb_test_no_output "set confirm off"
-gdb_test_no_output "return"
+gdb_test "return" ""
+
+# Verify there are no remains of the dummy frame.
+gdb_test_no_output "maintenance print dummy-frames"
+set test "maintenance info breakpoints"
+gdb_test_multiple $test $test {
+    -re " call dummy .*\r\n$gdb_prompt $" {
+	fail $test
+    }
+    -re "\r\n$gdb_prompt $" {
+	pass $test
+    }
+}
 
 # Resume execution, the program should continue without any signal.
 
@@ -136,7 +144,7 @@ if { "$frame_number" == "" } {
 # Pop the dummy frame.
 gdb_test "frame $frame_number" ".*"
 gdb_test_no_output "set confirm off"
-gdb_test_no_output "return"
+gdb_test "return" ""
 
 # Continue again, this time we should get to the signal handler.