From patchwork Tue Jan 17 13:00:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guinevere Larsen X-Patchwork-Id: 63274 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B4C43858412 for ; Tue, 17 Jan 2023 14:13:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B4C43858412 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673964825; bh=n+Y8Cp2vAqT8s1K2mAdoNPdecpf2it3CWvVndKY5NKg=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=fKu31Y74GRBeJfuczr6Ir01A6I/e0Zs2Kd5kLHzRQx8x/dJ2YGR01L9GA1o7rNKDU 7Fvo0ozAo0FXRyVGUVKjeoy56T4F/5B/0cqnEsvFRNCr8cqRTkgMqvdEoXoYh2u+ze KOe5POOH1MNd3sKqzIG26OD1ijIUf4DHIDdb+0mI= X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id F01E13858C27 for ; Tue, 17 Jan 2023 14:12:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F01E13858C27 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-330-XnWeyViKMZWq8Mx33IrUaQ-1; Tue, 17 Jan 2023 09:12:29 -0500 X-MC-Unique: XnWeyViKMZWq8Mx33IrUaQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 818893C10149 for ; Tue, 17 Jan 2023 14:12:26 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.43.2.105]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1041D40C6EC4; Tue, 17 Jan 2023 14:12:25 +0000 (UTC) To: gdb-patches@sourceware.org Cc: Bruno Larsen Subject: [PATCH 2/2] gdb/testsuite: fix running gdb.linespec/cp-completion-aliases.exp with clang Date: Tue, 17 Jan 2023 14:00:08 +0100 Message-Id: <20230117130007.1686917-3-blarsen@redhat.com> In-Reply-To: <20230117130007.1686917-1-blarsen@redhat.com> References: <20230117130007.1686917-1-blarsen@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org 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: , X-Patchwork-Original-From: Bruno Larsen via Gdb-patches From: Guinevere Larsen Reply-To: Bruno Larsen Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" Currently, all important tests in gdb.linespec/cp-completion-aliases.exp are failing when using clang because the wrong type is being suggested for the completion. For example, running with gcc and clang we get the following output respectively: (gdb) break get_value(object_p) <- gcc version (gdb) break get_value(object*) <- clang version Since both suggestions are acceptable on their own, and the original bug was if GDB suggested both at the same time, this commit updates the test to accept both, gcc's and clang's outputs. --- .../gdb.linespec/cp-completion-aliases.exp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.linespec/cp-completion-aliases.exp b/gdb/testsuite/gdb.linespec/cp-completion-aliases.exp index 33ad72e6f05..01ec61f4591 100644 --- a/gdb/testsuite/gdb.linespec/cp-completion-aliases.exp +++ b/gdb/testsuite/gdb.linespec/cp-completion-aliases.exp @@ -27,15 +27,15 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug}]} { # Disable the completion limit for the whole testcase. gdb_test_no_output "set max-completions unlimited" -test_gdb_complete_unique \ +test_gdb_complete_unique_re \ "break get_v" \ - "break get_value(object_p)" + "break get_value\\(object(_p|\\\*)\\)" -test_gdb_complete_unique \ +test_gdb_complete_unique_re \ "break gr" \ - "break grab_it(int_magic_t*)" + "break grab_it\\((int_magic_t|magic)\\\*\\)" -test_gdb_complete_multiple "break " "get_som" "ething(" { - "get_something(my_string_t)" - "get_something(object_p)" +test_gdb_complete_multiple_re "break " "get_som" "ething\\\(" { + "get_something\\((my_string_t|char\ const\\*)\\)" + "get_something\\(object(_p|\\*)\\)" }