From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2389 invoked by alias); 14 Jun 2002 19:46:12 -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 2343 invoked from network); 14 Jun 2002 19:46:10 -0000 Received: from unknown (HELO localhost.redhat.com) (216.138.202.10) by sources.redhat.com with SMTP; 14 Jun 2002 19:46:10 -0000 Received: from cygnus.com (localhost [127.0.0.1]) by localhost.redhat.com (Postfix) with ESMTP id 458C83CCC for ; Fri, 14 Jun 2002 15:46:09 -0400 (EDT) Message-ID: <3D0A4801.8030001@cygnus.com> Date: Fri, 14 Jun 2002 12:46:00 -0000 From: Andrew Cagney User-Agent: Mozilla/5.0 (X11; U; NetBSD macppc; en-US; rv:1.0.0) Gecko/20020613 X-Accept-Language: en-us, en MIME-Version: 1.0 To: gdb-patches@sources.redhat.com Subject: [rfa/testsuite] One pass/fail per expect list Content-Type: multipart/mixed; boundary="------------020300050405080706030805" X-SW-Source: 2002-06/txt/msg00249.txt.bz2 This is a multi-part message in MIME format. --------------020300050405080706030805 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 202 Hello, The attached tweaks gdb_expect_list{} so that it only prints one pass / fail / ... message for the testcase. What are peoples thoughts on this change and if positive, is the patch ok? Andrew --------------020300050405080706030805 Content-Type: text/plain; name="diffs" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="diffs" Content-length: 1860 2002-06-14 Andrew Cagney * lib/gdb.exp (gdb_expect_list): Only print one pass, fail, or supress message. Index: lib/gdb.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v retrieving revision 1.20 diff -u -r1.20 gdb.exp --- lib/gdb.exp 11 Jun 2002 20:37:05 -0000 1.20 +++ lib/gdb.exp 14 Jun 2002 19:21:30 -0000 @@ -1265,6 +1265,7 @@ set ok 1 if { $suppress_flag } { set ok 0 + unresolved "${test}" } while { ${index} < [llength ${list}] } { set pattern [lindex ${list} ${index}] @@ -1273,41 +1274,42 @@ if { ${ok} } { gdb_expect { -re "${pattern}${sentinel}" { - pass "${test}, pattern ${index} + sentinel" + # pass "${test}, pattern ${index} + sentinel" } -re "${sentinel}" { - fail "${test}, pattern ${index} + sentinel" + fail "${test} (pattern ${index} + sentinel)" set ok 0 } timeout { - fail "${test}, pattern ${index} + sentinel (timeout)" + fail "${test} (pattern ${index} + sentinel) (timeout)" set ok 0 } } } else { - unresolved "${test}, pattern ${index} + sentinel" + # unresolved "${test}, pattern ${index} + sentinel" } } else { if { ${ok} } { gdb_expect { -re "${pattern}" { - pass "${test}, pattern ${index}" + # pass "${test}, pattern ${index}" } -re "${sentinel}" { - fail "${test}, pattern ${index}" + fail "${test} (pattern ${index})" set ok 0 } timeout { - fail "${test}, pattern ${index} (timeout)" + fail "${test} (pattern ${index}) (timeout)" set ok 0 } } } else { - unresolved "${test}, pattern ${index}" + # unresolved "${test}, pattern ${index}" } } } if { ${ok} } { + pass "${test}" return 0 } else { return 1 --------------020300050405080706030805--