From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10062 invoked by alias); 3 Jan 2004 01:45:28 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 9940 invoked from network); 3 Jan 2004 01:45:26 -0000 Received: from unknown (HELO hall.mail.mindspring.net) (207.69.200.60) by sources.redhat.com with SMTP; 3 Jan 2004 01:45:26 -0000 Received: from user-119a90a.biz.mindspring.com ([66.149.36.10] helo=berman.michael-chastain.com) by hall.mail.mindspring.net with esmtp (Exim 3.33 #1) id 1Acaqz-0005Sf-00 for gdb-patches@sources.redhat.com; Fri, 02 Jan 2004 20:45:25 -0500 Received: by berman.michael-chastain.com (Postfix, from userid 502) id 2A5BD4B35A; Fri, 2 Jan 2004 20:45:21 -0500 (EST) To: gdb-patches@sources.redhat.com Subject: [patch/testsuite/cp] local.exp: accommodate gcc abi 2 Message-Id: <20040103014521.2A5BD4B35A@berman.michael-chastain.com> Date: Sat, 03 Jan 2004 01:45:00 -0000 From: mec.gnu@mindspring.com (Michael Elizabeth Chastain) X-SW-Source: 2004-01/txt/msg00041.txt.bz2 This expands local.exp to accommodate gcc HEAD -gstabs+ with the new abi. As with several other files, I just cloned the pattern for gcc 3.3.2 -gstabs+ abi-1 and re-ordered the fields. Tested with: native i686-pc-linux-gnu gcc 2.95.3 3.3.2 HEAD dwarf2, stabs+ tcl 8.4.5, expect 5.39, dejagnu 1.4.3 tcl + expect + dejagnu from sourceware I am committing this now. Michael C 2004-01-02 Michael Chastain * gdb.cp/local.exp: Accept gcc abi 2. Index: local.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/local.exp,v retrieving revision 1.1 diff -c -3 -p -r1.1 local.exp *** local.exp 23 Aug 2003 03:55:59 -0000 1.1 --- local.exp 3 Jan 2004 01:40:16 -0000 *************** *** 1,4 **** ! # Copyright 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by --- 1,5 ---- ! # Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004 ! # Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by *************** gdb_test "up" ".*foobar.*" "up from mark *** 96,101 **** --- 97,109 ---- # # chastain 2002-04-08 + # pattern #5 + # PASS + # stabs+ + # gcc HEAD abi-2 + # + # chastain 2004-01-02 + set sep "(\[.\]|___)\[0-9\]" send_gdb "ptype Local\n" *************** gdb_expect { *** 106,111 **** --- 114,120 ---- } -re "type = class Local \{\[\r\n\t \]*public:\[\r\n\t \]*int loc1;\[\r\n\t \]*Local & operator *=\\((foobar__Fi${sep}::|)Local const *&\\);\[\r\n\t \]*Local\\((foobar__Fi${sep}::|)Local const *&\\);\[\r\n\t \]*Local\\((void|)\\);\[\r\n\t \]*char loc_foo\\(char\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype Local" } -re "type = class Local \{\r\n\[\t \]*public:\r\n\[\t \]*int loc1;\r\n\r\n\[\t \]*char loc_foo\\(char\\);\r\n\[\t \]*\\(Local at.*local\\.cc:\[0-9\]*\\)\r\n\}.*$gdb_prompt $" { xpass "ptype Local (old aCC)" } + -re "type = class Local \{\[\r\n\t \]*public:\[\r\n\t \]*int loc1;\[\r\n\t \]*char loc_foo\\(char\\);\[\r\n\t \]*Local & operator *=\\((foobar__Fi${sep}::|)Local const *&\\);\[\r\n\t \]*Local\\((foobar__Fi${sep}::|)Local const *&\\);\[\r\n\t \]*Local\\((void|)\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype Local" } -re ".*$gdb_prompt $" { fail "ptype Local" } timeout { fail "(timeout) ptype Local" } } *************** gdb_expect { *** 131,136 **** --- 140,149 ---- # this right. kfail gdb/825 "Local out of scope" } + -re "ptype Local${eol}type = class Local {${eol} public:${eol} int loc1;${eol} char loc_foo\\(char\\);${eol}.*${eol}}${eol}${gdb_prompt} " { + # gcc 3.X abi-2 -gstabs+ + kfail gdb/825 "Local out of scope" + } -re ".*${gdb_prompt} $" { fail "Local out of scope" } *************** gdb_expect { *** 168,179 **** --- 181,200 ---- # # chastain 2002-05-27 + # Pattern 5: + # PASS + # stabs+ + # HEAD + # + # chastain 2004-01-02 + send_gdb "ptype InnerLocal\n" gdb_expect { -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*int il_foo\\((unsigned char const|const unsigned char) *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 1)" } -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 2)" } -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*InnerLocal::NestedInnerLocal nest1;\r\n\r\n\[\t \]*.int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\}\[\t \]*\\(Local at.*local\\.cc:36\\).*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" } -re "type = class InnerLocal \{\r\n\[\t \]*public:\r\n\[\t \]*char ilc;\r\n\[\t \]*int \\*ip;\r\n\[\t \]*class InnerLocal4::NestedInnerLocal nest1;\r\n\r\n\[\t \]*int il_foo\\(unsigned char const &\\);\r\n\[\t \]*\\(Local at.*local\.cc:\[0-9\]+\\)\r\n\}.*$gdb_prompt $" { pass "ptype InnerLocal (old HP aCC)" } + -re "type = class InnerLocal \{\[\r\n\t \]*public:\[\r\n\t \]*char ilc;\[\r\n\t \]*int \\* *ip;\[\r\n\t \]*(InnerLocal::|)NestedInnerLocal nest1;\[\r\n\t \]* int il_foo\\(unsigned char const *&\\);\[\r\n\t \]*InnerLocal *& operator *=\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((main${sep}::|)InnerLocal const *&\\);\[\r\n\t \]*InnerLocal\\((void|)\\);\[\r\n\t \]*\}.*$gdb_prompt $" { pass "ptype InnerLocal (pattern 5)" } -re ".*$gdb_prompt $" { fail "ptype InnerLocal" } timeout { fail "(timeout) ptype InnerLocal" } }