From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27303 invoked by alias); 25 May 2010 23:44:06 -0000 Received: (qmail 27291 invoked by uid 22791); 25 May 2010 23:44:04 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL,BAYES_00,TW_JM,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp-outbound-1.vmware.com (HELO smtp-outbound-1.vmware.com) (65.115.85.69) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 25 May 2010 23:43:59 +0000 Received: from jupiter.vmware.com (mailhost5.vmware.com [10.16.68.131]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id B3B7F4C008 for ; Tue, 25 May 2010 16:43:54 -0700 (PDT) Received: from msnyder-server.eng.vmware.com (promd-2s-dhcp138.eng.vmware.com [10.20.124.138]) by jupiter.vmware.com (Postfix) with ESMTP id A371BDC30C for ; Tue, 25 May 2010 16:43:54 -0700 (PDT) Message-ID: <4BFC60BA.2070808@vmware.com> Date: Wed, 26 May 2010 00:36:00 -0000 From: Michael Snyder User-Agent: Thunderbird 2.0.0.22 (X11/20090609) MIME-Version: 1.0 To: "gdb-patches@sourceware.org" Subject: [RFA] gdb.java/*.exp send_gdb vs. gdb_test Content-Type: multipart/mixed; boundary="------------060404020408070004060003" X-IsSubscribed: yes 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: 2010-05/txt/msg00586.txt.bz2 This is a multi-part message in MIME format. --------------060404020408070004060003 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 0 --------------060404020408070004060003 Content-Type: text/plain; name="java.exp.txt" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="java.exp.txt" Content-length: 3786 2010-05-25 Michael Snyder * gdb.java/jmisc.exp: Replace send_gdb with gdb_test. * gdb.java/jprint.exp: Replace send_gdb with gdb_test. Index: jmisc.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jmisc.exp,v retrieving revision 1.17 diff -u -p -r1.17 jmisc.exp --- jmisc.exp 5 May 2010 18:07:01 -0000 1.17 +++ jmisc.exp 25 May 2010 23:39:47 -0000 @@ -42,11 +42,7 @@ proc set_lang_java {} { verbose "loading file '$binfile'" gdb_load $binfile - send_gdb "set language java\n" - gdb_expect { - -re ".*$gdb_prompt $" {} - timeout { fail "set language java (timeout)" ; return 0 } - } + gdb_test_no_output "set language java" return [gdb_test "show language" ".* source language is \"java\".*" \ "set language to \"java\""] @@ -73,33 +69,27 @@ if ![set_lang_java] then { gdb_breakpoint "${function}void" { allow-pending } gdb_continue_to_breakpoint $function - send_gdb "ptype jmisc\n" - gdb_expect { - -re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" - { pass "ptype jmisc" } - -re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" - { pass "ptype jmisc" } - -re ".*$gdb_prompt $" { fail "ptype jmisc" } - timeout { fail "ptype jmisc (timeout)" ; return } + gdb_test_multiple "ptype jmisc" "ptype jmisc" { + -re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" { + pass "ptype jmisc" + } + -re "type = class jmisc extends java.lang.Object \{\[\r\n\ \t]+jmisc\\(\\);\[\r\n\ \t]+void main\\(java\.lang\.String\\\[]\\);\[\r\n\ \t]+\}\[\r\n\ \t]+$gdb_prompt $" { + pass "ptype jmisc" + } } - send_gdb "p args\n" - gdb_expect { - -re "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+\[\r\n\ \t]+$gdb_prompt $" { pass "p args" } - -re ".*$gdb_prompt $" { fail "p args" } - timeout { fail "p args (timeout)" ; return } - } + gdb_test "p args" \ + "\\\$1 = java\.lang\.String\\\[]@\[a-f0-9]+" - send_gdb "p *args\n" - gdb_expect { - -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" { pass "p *args" } + gdb_test_multiple "p *args\n" "p *args\n" { + -re "\\\$2 = \{length: 0\}\[\r\n\ \t]+$gdb_prompt $" { + pass "p *args" + } -re "\\\$2 = cannot find java.lang.Object.*$gdb_prompt $" { # Sometimes GCC 4.x does not emit the necessary information # about java.lang.Object. kfail "p *args" gdb/2214 } - -re ".*$gdb_prompt $" { fail "p *args" } - timeout { fail "p *args (timeout)" ; return } } # The idea of running to 'exit' is that 'exit' is in a different Index: jprint.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/gdb.java/jprint.exp,v retrieving revision 1.14 diff -u -p -r1.14 jprint.exp --- jprint.exp 5 May 2010 18:07:01 -0000 1.14 +++ jprint.exp 25 May 2010 23:39:47 -0000 @@ -41,11 +41,7 @@ proc set_lang_java {} { verbose "loading file '$binfile'" gdb_load $binfile - send_gdb "set language java\n" - gdb_expect { - -re ".*$gdb_prompt $" {} - timeout { fail "set language java (timeout)" ; return 0 } - } + gdb_test_no_output "set language java" return [gdb_test "show language" ".* source language is \"java\".*" \ "set language to \"java\""] --------------060404020408070004060003--