diff options
| author | Fernando Nasser <fnasser@redhat.com> | 2000-11-09 23:29:20 +0000 |
|---|---|---|
| committer | Fernando Nasser <fnasser@redhat.com> | 2000-11-09 23:29:20 +0000 |
| commit | a9e2e984e2cf6125ed6a4b2319829ee3fcf142b8 (patch) | |
| tree | b839f9dd696c6a7c8f163239d1c60ace2f721697 | |
| parent | 74e0dee8a12c84b4c5194795d6533d5c860fe826 (diff) | |
| download | gdb-a9e2e984e2cf6125ed6a4b2319829ee3fcf142b8.zip gdb-a9e2e984e2cf6125ed6a4b2319829ee3fcf142b8.tar.gz gdb-a9e2e984e2cf6125ed6a4b2319829ee3fcf142b8.tar.bz2 | |
2000-11-09 Fernando Nasser <fnasser@redhat.com>
* gdb.c++/templates.exp (test_template_breakpoints): Change Britsh
spelling "cancelled" to U.S. spelling "canceled" to match changes
made to gdb.
* gdb.c++/ovldbreak.exp: Ditto.
| -rw-r--r-- | gdb/testsuite/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/ovldbreak.exp | 12 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.c++/templates.exp | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 91f97eb8..7a0d322 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2000-11-09 Fernando Nasser <fnasser@redhat.com> + + * gdb.c++/templates.exp (test_template_breakpoints): Change Britsh + spelling "cancelled" to U.S. spelling "canceled" to match changes + made to gdb. + * gdb.c++/ovldbreak.exp: Ditto. + 2000-11-06 Peter Schauer <pes@regent.e-technik.tu-muenchen.de> * gdb.base/callfuncs.c (main): Moved to end of file, call diff --git a/gdb/testsuite/gdb.c++/ovldbreak.exp b/gdb/testsuite/gdb.c++/ovldbreak.exp index 2513b5f..97271d3 100644 --- a/gdb/testsuite/gdb.c++/ovldbreak.exp +++ b/gdb/testsuite/gdb.c++/ovldbreak.exp @@ -456,16 +456,16 @@ gdb_expect { -re "\\\[0\\\] cancel\r\n\\\[1\\\] all\r\n\\\[2\\\] foo::overload1arg\\(double\\) at.*$srcfile:121\r\n\\\[3\\\] foo::overload1arg\\(float\\) at.*$srcfile:120\r\n\\\[4\\\] foo::overload1arg\\(unsigned long\\) at.*$srcfile:119\r\n\\\[5\\\] foo::overload1arg\\(long\\) at.*$srcfile:118\r\n\\\[6\\\] foo::overload1arg\\(unsigned int\\) at.*$srcfile:117\r\n\\\[7\\\] foo::overload1arg\\(int\\) at.*$srcfile:116\r\n\\\[8\\\] foo::overload1arg\\(unsigned short\\) at.*$srcfile:115\r\n\\\[9\\\] foo::overload1arg\\(short\\) at.*$srcfile:114\r\n\\\[10\\\] foo::overload1arg\\(unsigned char\\) at.*$srcfile:113\r\n\\\[11\\\] foo::overload1arg\\(signed char\\) at.*$srcfile:112\r\n\\\[12\\\] foo::overload1arg\\(char\\) at.*$srcfile:111\r\n\\\[13\\\] foo::overload1arg\\(void\\) at.*$srcfile:110\r\n> $" { send_gdb "0\n" gdb_expect { - -re "cancelled\r\n$gdb_prompt $" { - pass "set bp cancelled" } + -re "canceled\r\n$gdb_prompt $" { + pass "set bp canceled" } -re ".*$gdb_prompt $" { - fail "set bp cancelled wrong bp reply" } + fail "set bp canceled wrong bp reply" } timeout { - fail "(timeout)set bp cancelled wrong bp reply" } + fail "(timeout)set bp canceled wrong bp reply" } } } - -re ".*$gdb_prompt $" { fail "set bp cancelled(wrong menu)" } - timeout { fail "(timeout)set bp cancelled(wrong menu)" } + -re ".*$gdb_prompt $" { fail "set bp canceled(wrong menu)" } + timeout { fail "(timeout)set bp canceled(wrong menu)" } } diff --git a/gdb/testsuite/gdb.c++/templates.exp b/gdb/testsuite/gdb.c++/templates.exp index 91acc82..d0ee96d 100644 --- a/gdb/testsuite/gdb.c++/templates.exp +++ b/gdb/testsuite/gdb.c++/templates.exp @@ -105,12 +105,12 @@ proc test_template_breakpoints {} { gdb_expect { -re "0. cancel.*\[\r\n\]*.1. all.*\[\r\n\]*.2. T5<int>::T5\\(int\\) at .*\[\r\n\]*.3. T5<int>::T5\\(T5<int> const &\\) at .*\[\r\n\]*> $" { gdb_test "0" \ - "cancelled" \ + "canceled" \ "constructor breakpoint (obsolete format!)" } -re ".0. cancel\[\r\n\]*.1. all\[\r\n\]*.2. T5<int>::T5\\(T5<int> const &\\) at .*templates.cc:.*\[\r\n\]*.3. T5<int>::T5\\(int\\) at .*templates.cc:.*\[\r\n\]*> $" { gdb_test "0" \ - "cancelled" \ + "canceled" \ "constructor breakpoint" } -re ".*$gdb_prompt $" { fail "constructor breakpoint" } |