From patchwork Tue Feb 7 10:11:27 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Machado X-Patchwork-Id: 19137 Received: (qmail 18869 invoked by alias); 7 Feb 2017 10:11:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 18822 invoked by uid 89); 7 Feb 2017 10:11:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=Hx-languages-length:2651 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 07 Feb 2017 10:11:35 +0000 Received: from svr-orw-fem-02x.mgc.mentorg.com ([147.34.96.206] helo=SVR-ORW-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1cb2kH-0007cY-BO from Luis_Gustavo@mentor.com ; Tue, 07 Feb 2017 02:11:33 -0800 Received: from Opsys.world.mentorg.com (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.3.224.2; Tue, 7 Feb 2017 02:11:32 -0800 From: Luis Machado To: CC: Subject: [PATCH,v2] Make gdb.arch/i386-biarch-core.exp more robust Date: Tue, 7 Feb 2017 04:11:27 -0600 Message-ID: <1486462287-14715-1-git-send-email-lgustavo@codesourcery.com> In-Reply-To: <1485870927-12623-1-git-send-email-lgustavo@codesourcery.com> References: <1485870927-12623-1-git-send-email-lgustavo@codesourcery.com> MIME-Version: 1.0 X-IsSubscribed: yes This test attempts to load a x86 core file no matter what target architectures the tested GDB supports. If GDB doesn't know how to handle a i386 target, it is very likely the core file will not be recognized. In this case we should still attempt to load a core file to make sure GDB doesn't crash or throws an internal error. But we should not proceed to try to read memory unconditionally. This patch makes the test check for proper i386 arch support in GDB and bails out if i386 is not supported and the core file format is not recognized. This addresses the spurious aarch64-elf failures i'm seeing for this test. gdb/testsuite/ChangeLog: YYYY-MM-DD Luis Machado * gdb.arch/i386-biarch-core.exp: Check for i386 arch support and return if core file is not recognized --- gdb/testsuite/gdb.arch/i386-biarch-core.exp | 30 ++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.arch/i386-biarch-core.exp b/gdb/testsuite/gdb.arch/i386-biarch-core.exp index 4c5f450..a05096c 100644 --- a/gdb/testsuite/gdb.arch/i386-biarch-core.exp +++ b/gdb/testsuite/gdb.arch/i386-biarch-core.exp @@ -54,6 +54,18 @@ if {$corestat(size) != 102400} { return -1 } +# First check if this particular GDB supports i386, otherwise we should not +# expect the i386 core file to be loaded successfully. +set supports_arch_i386 1 +set test "complete set architecture i386" +gdb_test_multiple $test $test { + -re ".*\r\nset architecture i386\r\n(.*\r\n)?$gdb_prompt $" { + } + -re "\r\n$gdb_prompt $" { + set supports_arch_i386 0 + } +} + # Wrongly built GDB complains by: # "..." is not a core dump: File format not recognized # As the provided test core has 64bit PRSTATUS i386 built GDB cannot parse it. @@ -62,7 +74,23 @@ if {$corestat(size) != 102400} { # objcopy as it corrupts the core file beyond all recognition. # The output therefore does not matter much, just we should not get GDB # internal error. -gdb_test "core-file ${corefile}" ".*" "core-file" +# +# If this particular GDB does not support i386, it is expected GDB will not +# recognize the core file. If it does anyway, it should not crash. +set test "load core file" +gdb_test_multiple "core-file ${corefile}" $test { + -re ".* no core file handler recognizes format(.*\r\n)?$gdb_prompt $" { + if { $supports_arch_i386 } { + fail $test + } else { + untested $test + return + } + } + -re "\r\n$gdb_prompt $" { + pass $test + } +} # Test if at least the core file segments memory has been loaded. # https://bugzilla.redhat.com/show_bug.cgi?id=457187