From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2758 invoked by alias); 6 Jan 2002 07:15:39 -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 2711 invoked from network); 6 Jan 2002 07:15:38 -0000 Received: from unknown (HELO fred.ninemoons.com) (64.232.230.104) by sources.redhat.com with SMTP; 6 Jan 2002 07:15:38 -0000 Received: (from fnf@localhost) by fred.ninemoons.com (8.11.6/8.11.6) id g067E9l07719; Sun, 6 Jan 2002 00:14:09 -0700 From: Fred Fish Message-Id: <200201060714.g067E9l07719@fred.ninemoons.com> Subject: [RFA] Only need one "maint info breakpoint" test To: gdb-patches@sources.redhat.com Date: Sat, 05 Jan 2002 23:15:00 -0000 Cc: fnf@redhat.com Reply-To: fnf@redhat.com X-Mailer: ELM [version 2.5 PL6] MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-SW-Source: 2002-01/txt/msg00085.txt.bz2 We really only need to run the "maint info breakpoints" test once and optionally accept the "shlib events" variation. Also tweaked the whitespace for consistency with the other nearby tests. 2002-01-05 Fred Fish * gdb.base/maint.exp: Simplify the "maint info breakpoints" test to optionally accept the "shlib events" variation. Index: gdb.base/maint.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/maint.exp,v retrieving revision 1.9 diff -c -p -r1.9 maint.exp *** maint.exp 2002/01/05 02:40:47 1.9 --- maint.exp 2002/01/06 07:12:22 *************** gdb_expect { *** 415,446 **** send_gdb "maint info breakpoints\n" gdb_expect { ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ ! { pass "maint info breakpoints" } ! -re ".*$gdb_prompt $" { fail "maint info breakpoints" } ! timeout { fail "(timeout) maint info breakpoints" } } - - # Try it again, and check for shlib event info. Not supported everywhere. - if {! ([istarget "hppa*-*-hpux*"] - || [istarget "*-*-linux*"] - || [istarget "*-*-solaris*"])} then { - setup_xfail "*-*-*" - } - send_gdb "maint info breakpoints\n" - gdb_expect { - -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ - { pass "maint info breakpoints" } - -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\ - { pass "maint info breakpoints: shlib events" } - -re ".*$gdb_prompt $" { - fail "maint info breakpoints: shlib events" - } - timeout { - fail "(timeout) maint info breakpoints: shlib events" - } - } - send_gdb "maint print\n" gdb_expect { --- 415,427 ---- send_gdb "maint info breakpoints\n" gdb_expect { ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n.*$gdb_prompt $"\ ! { pass "maint info breakpoints" } ! -re "Num\[ \t\]+Type\[ \t\]+Disp\[ \t\]+Enb\[ \t\]+Address\[ \t\]+What\r\n1\[ \t\]+breakpoint\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex in main at.*break.c:75\r\n\[ \t\]+breakpoint already hit 1 time\r\n-1\[ \t\]+shlib events\[ \t\]+keep\[ \t\]+y\[ \t\]+$hex.*breakpoint already hit.*$gdb_prompt $"\ ! { pass "maint info breakpoints (with shlib events)" } ! -re ".*$gdb_prompt $" { fail "maint info breakpoints" } ! timeout { fail "(timeout) maint info breakpoints" } } send_gdb "maint print\n" gdb_expect {