This is the mail archive of the gdb-patches@sources.redhat.com mailing list for the GDB project.


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

Fixed 2 testsuite regressions


Just a quick fix to the pattern expected.  There was no real problem.

        * 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.

-- 
Fernando Nasser
Red Hat Canada Ltd.                     E-Mail:  fnasser@redhat.com
2323 Yonge Street, Suite #300
Toronto, Ontario   M4P 2C9


===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/ovldbreak.exp,v
retrieving revision 1.1.1.5
diff -c -p -r1.1.1.5 ovldbreak.exp
*** ovldbreak.exp       2000/02/05 07:30:00     1.1.1.5
--- ovldbreak.exp       2000/11/09 23:22:58
*************** gdb_expect {
*** 456,471 ****
  -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 ".*$gdb_prompt $" {
!                        fail "set bp cancelled  wrong bp reply" }
                 timeout           {
!                        fail "(timeout)set bp cancelled wrong bp reply" }
               }
           }
!     -re ".*$gdb_prompt $" { fail "set bp cancelled(wrong menu)" }
!     timeout           { fail "(timeout)set bp cancelled(wrong menu)" }
    }
  
  
--- 456,471 ----
  -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 "canceled\r\n$gdb_prompt $" {
!                        pass "set bp canceled" }
                 -re ".*$gdb_prompt $" {
!                        fail "set bp canceled  wrong bp reply" }
                 timeout           {
!                        fail "(timeout)set bp canceled wrong bp reply" }
               }
           }
!     -re ".*$gdb_prompt $" { fail "set bp canceled(wrong menu)" }
!     timeout           { fail "(timeout)set bp canceled(wrong menu)" }
    }
  
  
Index: templates.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.c++/templates.exp,v
retrieving revision 1.2
diff -c -p -r1.2 templates.exp
*** templates.exp       2000/06/05 20:47:28     1.2
--- templates.exp       2000/11/09 23:22:58
*************** proc test_template_breakpoints {} {
*** 105,116 ****
      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" \
                "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" \
                "constructor breakpoint"
        }
        -re ".*$gdb_prompt $" { fail "constructor breakpoint" }
--- 105,116 ----
      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" \
!               "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" \
!               "canceled" \
                "constructor breakpoint"
        }
        -re ".*$gdb_prompt $" { fail "constructor breakpoint" }

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