2006-03-30 Paul Brook <paul@codesourcery.com>

	Backport form mainline.
	* gdb/testsuite/gdb.mi/mi-until.exp: kfail broken until command.
	* gdb/testsuite/gdb.mi/mi2-until.exp: Ditto.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 1a1b0df829c95612a61404e579a8bf0841fa39ec..50f1c478ef6aa43f72d10199280ab2d4bdce2f5a 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,9 @@
+2006-03-30  Paul Brook  <paul@codesourcery.com>
+
+       Backport form mainline.
+       * gdb/testsuite/gdb.mi/mi-until.exp: kfail broken until command.
+       * gdb/testsuite/gdb.mi/mi2-until.exp: Ditto.
+
 2006-03-29  Nathan Sidwell  <nathan@codesourcery.com>
 
        * gdb/m68k-tdep.c (M68K_FPREG_TYPE, M68K_LONG_DOUBLE_FORMAT,

diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index eb90d0dcd2494f45e9e8944ba3dd1dfbadf00dc0..ff686afd5e3e1ed275d88d58b9e2fe472de1d6df 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -81,6 +81,9 @@ proc test_until {} {
        -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
            pass "until after while loop"
        }
+       -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"9\"\}\r\n$mi_gdb_prompt$" {
+           kfail gdb/2104 "until after while loop (went backwards)"
+       }
        timeout {
            fail "until after while loop (timeout)"
        }

diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
index f5d949157cb65b628d5de3bff9684bfb93a2ebc2..760a4a2102ab9fecbe775d82fbc941ca935c8c81 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ b/gdb/testsuite/gdb.mi/mi2-until.exp
@@ -82,6 +82,9 @@ proc test_until {} {
        -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"12\"\}\r\n$mi_gdb_prompt$" {
            pass "until after while loop"
        }
+       -re "111\\^running\r\n${mi_gdb_prompt}111\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"foo\",args=\\\[\\\],file=\".*until.c\",fullname=\"${fullname_syntax}${srcfile}\",line=\"9\"\}\r\n$mi_gdb_prompt$" {
+           kfail gdb/2104 "until after while loop (went backwards)"
+       }
        timeout {
            fail "until after while loop (timeout)"
        }