From patchwork Sun Sep 29 21:52:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 34719 Received: (qmail 111547 invoked by alias); 29 Sep 2019 21:52:54 -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 111536 invoked by uid 89); 29 Sep 2019 21:52:53 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 29 Sep 2019 21:52:52 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 6F8CFAE6D; Sun, 29 Sep 2019 21:52:50 +0000 (UTC) Date: Sun, 29 Sep 2019 23:52:48 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Cc: Simon Marchi Subject: [committed][gdb/testsuite] Make pass message unique in gdb-index.exp for cc-with-dwz-m Message-ID: <20190929215246.GA23098@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, With cc-with-dwz-m, we get: ... PASS: gdb.dwarf2/gdb-index.exp: objcopy PASS: gdb.dwarf2/gdb-index.exp: objcopy ... Make the pass message unique by using with_test_prefix: ... PASS: gdb.dwarf2/gdb-index.exp: objcopy PASS: gdb.dwarf2/gdb-index.exp: modify dwz file: objcopy ... Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Make pass message unique in gdb-index.exp for cc-with-dwz-m gdb/testsuite/ChangeLog: 2019-09-29 Tom de Vries * gdb.dwarf2/gdb-index.exp: Use with_test_prefix for second objcopy. --- gdb/testsuite/gdb.dwarf2/gdb-index.exp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp index 6fca3c61299..b14e07fa55d 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp @@ -59,14 +59,16 @@ proc add_gdb_index { program } { return "" } - if { [remote_file host exists ${dwz_index_file}] } { - # We're modifying $dwz in place, otherwise we'd have to update - # .gnu_debugaltlink in $program. - set args [join [list "--remove-section .gdb_index" \ - " --add-section .gdb_index=$dwz_index_file" \ - " --set-section-flags .gdb_index=readonly $dwz"]] - if {[run_on_host "objcopy" [gdb_find_objcopy] "$args"]} { - return "" + with_test_prefix "modify dwz file" { + if { [remote_file host exists ${dwz_index_file}] } { + # We're modifying $dwz in place, otherwise we'd have to update + # .gnu_debugaltlink in $program. + set args [join [list "--remove-section .gdb_index" \ + " --add-section .gdb_index=$dwz_index_file" \ + " --set-section-flags .gdb_index=readonly $dwz"]] + if {[run_on_host "objcopy" [gdb_find_objcopy] "$args"]} { + return "" + } } }