From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6316 invoked by alias); 13 Feb 2009 23:38:06 -0000 Received: (qmail 6306 invoked by uid 22791); 13 Feb 2009 23:38:05 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_33,J_CHICKENPOX_63 X-Spam-Check-By: sourceware.org Received: from mailhost.u-strasbg.fr (HELO mailhost.u-strasbg.fr) (130.79.200.153) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 13 Feb 2009 23:37:56 +0000 Received: from baal.u-strasbg.fr (baal.u-strasbg.fr [IPv6:2001:660:2402::41]) by mailhost.u-strasbg.fr (8.14.2/jtpda-5.5pre1) with ESMTP id n1DNbS7L075826 ; Sat, 14 Feb 2009 00:37:28 +0100 (CET) Received: from mailserver.u-strasbg.fr (ms4.u-strasbg.fr [IPv6:2001:660:2402:d::13]) by baal.u-strasbg.fr (8.14.0/jtpda-5.5pre1) with ESMTP id n1DNbRoc070422 ; Sat, 14 Feb 2009 00:37:28 +0100 (CET) (envelope-from muller@ics.u-strasbg.fr) Received: from d620muller (lec67-4-82-230-53-140.fbx.proxad.net [82.230.53.140]) (user=mullerp mech=LOGIN) by mailserver.u-strasbg.fr (8.14.3/jtpda-5.5pre1) with ESMTP id n1DNbQGm071664 (version=TLSv1/SSLv3 cipher=RC4-MD5 bits=128 verify=NO) ; Sat, 14 Feb 2009 00:37:26 +0100 (CET) (envelope-from muller@ics.u-strasbg.fr) From: "Pierre Muller" To: "'Tom Tromey'" Cc: References: <005701c98df9$25262600$6f727200$@u-strasbg.fr> <000101c98e2d$3cc425d0$b64c7170$@u-strasbg.fr> In-Reply-To: Subject: [Commit]: small test suite cleanup Date: Fri, 13 Feb 2009 23:49:00 -0000 Message-ID: <000601c98e34$09bc0390$1d340ab0$@u-strasbg.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-02/txt/msg00314.txt.bz2 After Tom's approval, this is what I finally committed Pierre Muller Pascal language support maintainer for GDB 2009-02-14 Pierre Muller * lib/gdb.exp (get_valueof): Accept anything as a return value. (get_integer_valueof): New procedure. (get_sizeof): Use new get_integer_value_of. * gdb.base/sizeof.exp: Replace all uses of get_valueof by get_integer_valueof. $ cvs diff -up lib/gdb.exp gdb.base/sizeof.exp ChangeLog Index: lib/gdb.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/gdb.exp,v retrieving revision 1.110 diff -u -p -r1.110 gdb.exp --- lib/gdb.exp 13 Feb 2009 16:13:47 -0000 1.110 +++ lib/gdb.exp 13 Feb 2009 23:34:28 -0000 @@ -2885,19 +2885,36 @@ proc get_valueof { fmt exp default } { set test "get valueof \"${exp}\"" set val ${default} gdb_test_multiple "print${fmt} ${exp}" "$test" { + -re "\\$\[0-9\]* = (.*)\[\r\n\]*$gdb_prompt $" { + set val $expect_out(1,string) + pass "$test ($val)" + } + timeout { + fail "$test (timeout)" + } + } + return ${val} +} + +proc get_integer_valueof { exp default } { + global gdb_prompt + + set test "get integer valueof \"${exp}\"" + set val ${default} + gdb_test_multiple "print /d ${exp}" "$test" { -re "\\$\[0-9\]* = (\[-\]*\[0-9\]*).*$gdb_prompt $" { set val $expect_out(1,string) pass "$test ($val)" } timeout { - set size ${default} - fail "get value of ${exp} (timeout)" + fail "$test (timeout)" } } return ${val} } + proc get_sizeof { type default } { - return [get_valueof "/d" "sizeof (${type})" $default] + return [get_integer_valueof "sizeof (${type})" $default] } Index: gdb.base/sizeof.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.base/sizeof.exp,v retrieving revision 1.14 diff -u -p -r1.14 sizeof.exp --- gdb.base/sizeof.exp 13 Feb 2009 16:13:47 -0000 1.14 +++ gdb.base/sizeof.exp 13 Feb 2009 23:34:28 -0000 @@ -109,10 +109,10 @@ proc check_valueof { exp val } { # Check that GDB and the target agree over the sign of a character. -set signof_byte [get_valueof "/d" "'\\377'" -1] -set signof_char [get_valueof "/d" "(int) (char) -1" -1] -set signof_signed_char [get_valueof "/d" "(int) (signed char) -1" -1] -set signof_unsigned_char [get_valueof "/d" "(int) (unsigned char) -1" -1] +set signof_byte [get_integer_valueof "'\\377'" -1] +set signof_char [get_integer_valueof "(int) (char) -1" -1] +set signof_signed_char [get_integer_valueof "(int) (signed char) -1" -1] +set signof_unsigned_char [get_integer_valueof "(int) (unsigned char) -1" -1] check_valueof "'\\377'" ${signof_byte} check_valueof "(int) (char) -1" ${signof_char}