2009-07-14 Michael Snyder <msnyder@vmware.com>

	* gdb.reverse/step-reverse.exp (stepi into function call):
	Call instruction may not be first instruction in the line.
	(reverse stepi from a function call): Used wrong line number.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 388303d751ef39458c0cdfbdba1fd61ef1baca1a..763a12f4d97c69b6ee26be1e2662bbd3be18fcaf 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-14  Michael Snyder  <msnyder@vmware.com>
+
+       * gdb.reverse/step-reverse.exp (stepi into function call):
+       Call instruction may not be first instruction in the line.
+       (reverse stepi from a function call): Used wrong line number.
+
 2009-07-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * gdb.arch/amd64-i386-address.exp, gdb.arch/amd64-i386-address.S: New.

diff --git a/gdb/testsuite/gdb.reverse/step-reverse.exp b/gdb/testsuite/gdb.reverse/step-reverse.exp
index 050b75058a6d654ecdb0a9e126dcf1e08ce1733a..31a707d86e481711f66deaa6b3a9f5d5d9546b92 100644 (file)
--- a/gdb/testsuite/gdb.reverse/step-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/step-reverse.exp
@@ -104,6 +104,10 @@ gdb_test_multiple "stepi" "$test_message" {
        send_gdb "stepi\n"
        exp_continue
     }
+    -re "STEPI TEST.*$gdb_prompt $" {
+       send_gdb "stepi\n"
+       exp_continue
+    }
 }
 
 # stepi thru return of a function call
@@ -168,7 +172,7 @@ gdb_test_multiple "stepi" "$test_message" {
 
 # stepi backward out of a function call
 
-set stepi_location  [gdb_get_line_number "FINISH TEST" "$srcfile"]
+set stepi_location  [gdb_get_line_number "STEPI TEST" "$srcfile"]
 set test_message "reverse stepi from a function call"
 gdb_test_multiple "stepi" "$test_message" {
     -re "ARRIVED IN CALLEE.*$gdb_prompt $" {
@@ -178,7 +182,7 @@ gdb_test_multiple "stepi" "$test_message" {
        send_gdb "stepi\n" 
        exp_continue
     }
-    -re "${hex}\[ \t\]*$stepi_location.*STEPI TEST.*$gdb_prompt $" {
+    -re "${hex} in main .*:$stepi_location.*STEPI TEST.*$gdb_prompt $" {
        send_gdb "stepi\n"
        exp_continue
     }