From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id rS3WCckJhF8TYQAAWB0awg (envelope-from ) for ; Mon, 12 Oct 2020 03:46:17 -0400 Received: by simark.ca (Postfix, from userid 112) id 12EE91EF6F; Mon, 12 Oct 2020 03:46:17 -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.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FAKE_REPLY_C,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 CD5951E58C for ; Mon, 12 Oct 2020 03:46:15 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BE3E1386EC25; Mon, 12 Oct 2020 07:46:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BE3E1386EC25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1602488774; bh=26B52/u/Icw+2V3KILrsRjpQs99A9FI0bCILIV9+5aQ=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=yQ4U5VZxRwNSt6EUL73214+PfkMAqUEogucLn9T/iXJ8zHmyo1zqF21HmVdZX8Ujf osthkF/F2wzzIWTXX7UbUZCjNh2BN6LpCwBwPJO6q0dVeNcjsk/PxiEUNTlrT5I8cQ hdJrXqO7nCvdqRGXfU6mMXYJ1qokiTrs+5A4v8LY= Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by sourceware.org (Postfix) with ESMTPS id D59E1385783D for ; Mon, 12 Oct 2020 07:46:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D59E1385783D Received: by mail-pf1-x435.google.com with SMTP id e10so12765851pfj.1 for ; Mon, 12 Oct 2020 00:46:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-disposition:user-agent; bh=26B52/u/Icw+2V3KILrsRjpQs99A9FI0bCILIV9+5aQ=; b=XZDzpSgCdmXC7RvCCYLw2/lexK83DloDbGLEsG5wtzyTzz2w4UZMUp63dGWGsuFNaG 4Nd7qAIaI5eHJneNjW8fLiyBBnhsCUmyB8XJxyXb05J0D3sXlSwoAfVYJ/qpgKgo7gUs YQGuYu4KjPn/PAQMYDnLyzw1fgpI5bzJVuBMvc9hWDQoup2RdK3E8K31ROEBZT3HXdD6 I2j70mhz/avfYajc/3kKMChz1hMMuxxluGam6DBPuRrkg5ko4E5MEdEQZLloBDlhZkBH bx27gllJ2PxKSJSZ8UuE8LtHMbyLhmhTx7kN1ECVrx0M1MOlkApzHFDvizvpB+OI7PlX DmTg== X-Gm-Message-State: AOAM531vRxLt8ZRVRAh4P/xyiiFnu4P9neD5QQL2PU2Xa/rbezAR17+9 PKEq11aWc3LbjLBe0Wl8zk1asxC2KLmYcA== X-Google-Smtp-Source: ABdhPJxk1hy6I7woDs+u96xoxPzUCnyH7RIcjEaSo5CrgZ9sF0nHiD8VKfYXMtNilzi4Sw4WxYJ7yw== X-Received: by 2002:a17:90b:1b03:: with SMTP id nu3mr9455332pjb.64.1602488769977; Mon, 12 Oct 2020 00:46:09 -0700 (PDT) Received: from bubble.grove.modra.org (158.106.96.58.static.exetel.com.au. [58.96.106.158]) by smtp.gmail.com with ESMTPSA id s3sm18596001pfe.116.2020.10.12.00.46.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Oct 2020 00:46:09 -0700 (PDT) Received: by bubble.grove.modra.org (Postfix, from userid 1000) id 1DEC785936; Mon, 12 Oct 2020 18:16:05 +1030 (ACDT) Date: Mon, 12 Oct 2020 18:16:05 +1030 To: gdb-patches@sourceware.org Subject: Re: gdb: Improve formatting of 'show architecture' messages Message-ID: <20201012074604.GJ19404@bubble.grove.modra.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) 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: , From: Alan Modra via Gdb-patches Reply-To: Alan Modra Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Commit ccb9eba6a25 updated the testsuite for some targets without running the testsuite on those targets. This patch corrects the update, in most cases just adding the expected full-stop. On powerpc64le-linux, fixes these: FAIL: gdb.arch/powerpc-d128-regs.exp: checking for PPC arch FAIL: gdb.arch/powerpc-disassembler-options.exp: set architecture powerpc:common64 FAIL: gdb.arch/powerpc-disassembler-options.exp: set architecture rs6000:6000 FAIL: gdb.arch/ppc64-symtab-cordic.exp: show architecture I also verified that arm-linuxeabi and s390x-linux cross-builds now pass their disassembler-options.exp tests. OK to apply? * testsuite/gdb.arch/arm-disassembler-options.exp: Adjust expected "target architecture" output. * testsuite/gdb.arch/powerpc-d128-regs.exp: Likewise. * testsuite/gdb.arch/powerpc-disassembler-options.exp: Likewise. * testsuite/gdb.arch/ppc64-symtab-cordic.exp: Likewise. * testsuite/gdb.arch/s390-disassembler-options.exp: Likewise. diff --git a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp index ac1d8a8bda..a3c0c0e5f8 100644 --- a/gdb/testsuite/gdb.arch/arm-disassembler-options.exp +++ b/gdb/testsuite/gdb.arch/arm-disassembler-options.exp @@ -31,7 +31,7 @@ set arch1 "armv2" set arch2 "armv5" gdb_test "set architecture $arch1" \ - "The target architecture is set to \"$arch1\"" \ + "The target architecture is set to \"$arch1\"\." \ "set architecture $arch1" gdb_test_no_output "set disassembler-options" @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \ # Change architectures and verify the disassembler options have been preserved. gdb_test "set architecture $arch2" \ - "The target architecture is set to \"$arch2\"" \ + "The target architecture is set to \"$arch2\"\." \ "set architecture $arch2" gdb_test "show disassembler-options" \ diff --git a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp index e7bbccb271..cd96029fe8 100644 --- a/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp +++ b/gdb/testsuite/gdb.arch/powerpc-d128-regs.exp @@ -44,7 +44,7 @@ if { ![runto main] } then { return } -if [gdb_test "show arch" ".*currently powerpc:common.*" "checking for PPC arch"] { +if [gdb_test "show arch" ".*powerpc:common.*" "checking for PPC arch"] { return -1 } diff --git a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp index 68d9bf61e1..9b3f8309fe 100644 --- a/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp +++ b/gdb/testsuite/gdb.arch/powerpc-disassembler-options.exp @@ -31,7 +31,7 @@ set arch1 "rs6000:6000" set arch2 "powerpc:common64" gdb_test "set architecture $arch1" \ - "The target architecture is set to \"$arch1\"" \ + "The target architecture is set to \"$arch1\"\." \ "set architecture $arch1" gdb_test_no_output "set disassembler-options" @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \ # Change architectures and verify the disassembler options have been preserved. gdb_test "set architecture $arch2" \ - "The target architecture is set to \"$arch2\"" \ + "The target architecture is set to \"$arch2\"\." \ "set architecture $arch2" gdb_test "show disassembler-options" \ diff --git a/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp b/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp index fa5bff9ceb..a1fa5ffabe 100644 --- a/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp +++ b/gdb/testsuite/gdb.arch/ppc64-symtab-cordic.exp @@ -47,10 +47,10 @@ gdb_load ${kofile} set test "show architecture" gdb_test_multiple $test $test { - -re "\r\nThe target architecture is set to \"auto\" \\(currently \"powerpc:common64\"\\)\r\n$gdb_prompt $" { + -re "\r\nThe target architecture is set to \"auto\" \\(currently \"powerpc:common64\"\\)\.\r\n$gdb_prompt $" { pass $test } - -re "\r\nThe target architecture is set to \"auto\" \\(currently \".*\"\\)\r\n$gdb_prompt $" { + -re "\r\nThe target architecture is set to \"auto\" \\(currently \".*\"\\)\.\r\n$gdb_prompt $" { untested "powerpc:common64 is not supported" } } diff --git a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp index a9ae230aa0..16e7cd18d7 100644 --- a/gdb/testsuite/gdb.arch/s390-disassembler-options.exp +++ b/gdb/testsuite/gdb.arch/s390-disassembler-options.exp @@ -31,7 +31,7 @@ set arch1 "s390:64-bit" set arch2 "s390:31-bit" gdb_test "set architecture $arch1" \ - "The target architecture is set to \"$arch1\"" \ + "The target architecture is set to \"$arch1\"\." \ "set architecture $arch1" gdb_test_no_output "set disassembler-options" @@ -47,7 +47,7 @@ gdb_test "show disassembler-options" \ # Change architectures and verify the disassembler options have been preserved. gdb_test "set architecture $arch2" \ - "The target architecture is set to \"$arch2\"" \ + "The target architecture is set to \"$arch2\"\." \ "set architecture $arch2" gdb_test "show disassembler-options" \ -- Alan Modra Australia Development Lab, IBM