From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 6GPvFJfPmV96bwAAWB0awg (envelope-from ) for ; Wed, 28 Oct 2020 16:07:51 -0400 Received: by simark.ca (Postfix, from userid 112) id 53AA31EFC1; Wed, 28 Oct 2020 16:07:51 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=MAILING_LIST_MULTI, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 586E81E590 for ; Wed, 28 Oct 2020 16:07:50 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1E9D03858001; Wed, 28 Oct 2020 20:07:50 +0000 (GMT) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 941503858001 for ; Wed, 28 Oct 2020 20:07:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 941503858001 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id A634AACC4 for ; Wed, 28 Oct 2020 20:07:44 +0000 (UTC) Date: Wed, 28 Oct 2020 21:07:43 +0100 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.base/relocate.exp with -readnow Message-ID: <20201028200741.GA27840@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Hi, With test-case gdb.base/relocate.exp and target board readnow, we get: ... FAIL: gdb.base/relocate.exp: symbol-file with offset FAIL: gdb.base/relocate.exp: add-symbol-file with offset FAIL: gdb.base/relocate.exp: add-symbol-file with offset, text address given FAIL: gdb.base/relocate.exp: add-symbol-file with offset, data address given ... Fix these FAILs by updating the regexps for -readnow. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.base/relocate.exp with -readnow gdb/testsuite/ChangeLog: 2020-10-28 Tom de Vries * gdb.base/relocate.exp: Update regexp for -readnow. --- gdb/testsuite/gdb.base/relocate.exp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.base/relocate.exp b/gdb/testsuite/gdb.base/relocate.exp index 906d16b4a4..8ed23987b1 100644 --- a/gdb/testsuite/gdb.base/relocate.exp +++ b/gdb/testsuite/gdb.base/relocate.exp @@ -222,8 +222,9 @@ if { "${function_foo_addr}" == "${new_function_foo_addr}" } { set offset 0x10000 clean_restart +set readnow_re "Expanding full symbols from ${binfile}\.\.\." gdb_test "symbol-file -o $offset $binfile" \ - "Reading symbols from ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \ "symbol-file with offset" with_test_prefix "static vars" { @@ -253,7 +254,7 @@ with_test_prefix "functions" { set offset 0x10000 clean_restart gdb_test "add-symbol-file -o $offset $binfile" \ - "Reading symbols from ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \ "add-symbol-file with offset" \ "add symbol table from file \".*${testfile}\\.o\" with all sections offset by $offset\[\r\n\]+\\(y or n\\) " \ "y" @@ -284,7 +285,7 @@ with_test_prefix "functions, 2nd" { set text [ format "0x%x" [expr ${function_foo_addr} + 0x20000] ] clean_restart gdb_test "add-symbol-file $binfile -o $offset $text" \ - "Reading symbols from ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \ "add-symbol-file with offset, text address given" \ "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.text_addr = ${text}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \ "y" @@ -301,7 +302,7 @@ with_test_prefix "functions, 3rd" { set data [ format "0x%x" [expr ${global_foo_addr} + 0x20000] ] clean_restart gdb_test "add-symbol-file $binfile -o $offset -s .data $data" \ - "Reading symbols from ${binfile}\.\.\." \ + "Reading symbols from ${binfile}\.\.\.(\r\n$readnow_re)?" \ "add-symbol-file with offset, data address given" \ "add symbol table from file \".*${testfile}\\.o\" at\[ \t\r\n\]+\.data_addr = ${data}\[\r\n\]+with other sections offset by ${offset}\[\r\n\]+\\(y or n\\) " \ "y"