From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17744 invoked by alias); 13 Jan 2014 16:43:17 -0000 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 Received: (qmail 17734 invoked by uid 89); 13 Jan 2014 16:43:16 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp18.uk.ibm.com Received: from e06smtp18.uk.ibm.com (HELO e06smtp18.uk.ibm.com) (195.75.94.114) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 13 Jan 2014 16:43:15 +0000 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 13 Jan 2014 16:43:11 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 13 Jan 2014 16:43:10 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (d06relay09.portsmouth.uk.ibm.com [9.149.109.194]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 518DF17D8059 for ; Mon, 13 Jan 2014 16:43:21 +0000 (GMT) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s0DGgvu465732798 for ; Mon, 13 Jan 2014 16:42:57 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s0DGh8cK021042 for ; Mon, 13 Jan 2014 09:43:09 -0700 Received: from br87z6lw.de.ibm.com (dyn-9-152-212-219.boeblingen.de.ibm.com [9.152.212.219]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s0DGh7Ca021029; Mon, 13 Jan 2014 09:43:07 -0700 From: Andreas Arnez To: gdb-patches@sourceware.org Cc: Sergio Durigan Junior , Ulrich Weigand , Andreas Krebbel , Yao Qi Subject: [PATCH] Fix regression on s390x with entry-values.exp Date: Mon, 13 Jan 2014 16:43:00 -0000 Message-ID: <87a9ez4yuc.fsf@br87z6lw.de.ibm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14011316-6892-0000-0000-000007735FCF X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00319.txt.bz2 The trace-specific test case 'entry-values' concludes fairly late in the process that this platform doesn't support trace. Before that, there are some platform specifics that don't work on s390x. The fix below addresses two aspects: * Removal of an excess space character in the regex for the disassembly. This is needed when there is a function alignment gap, because then the hex address is immediately followed by a colon. * Handling for the s390-specific call instruction. -- testsuite/ChangeLog 2014-01-13 Andreas Arnez * gdb.trace/entry-values.exp: Remove excess space character from regex patterns. Handle s390 call instruction. Modified gdb/testsuite/gdb.trace/entry-values.exp diff --git a/gdb/testsuite/gdb.trace/entry-values.exp b/gdb/testsuite/gdb.trace/entry-values.exp index 0fb35a0..f10ffa6 100644 --- a/gdb/testsuite/gdb.trace/entry-values.exp +++ b/gdb/testsuite/gdb.trace/entry-values.exp @@ -57,7 +57,7 @@ gdb_test_multiple $test $test { set test "disassemble foo+$foo_length,+10" gdb_test_multiple $test $test { - -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex) .*\.\r\n$gdb_prompt $" { + -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { set start $expect_out(1,string) set end $expect_out(2,string) @@ -77,6 +77,8 @@ set bar_call_foo "" if { [istarget "arm*-*-*"] || [istarget "aarch64*-*-*"] } { set call_insn "bl" +} elseif { [istarget "s390*-*-*"] } { + set call_insn "brasl" } else { set call_insn "call" } @@ -109,7 +111,7 @@ if { [string equal $bar_call_foo ""] || [string equal $bar_length ""] } { set test "disassemble bar+$bar_length,+10" gdb_test_multiple $test $test { - -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex) .*\.\r\n$gdb_prompt $" { + -re ".*($hex) :\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" { set start $expect_out(1,string) set end $expect_out(2,string)