From patchwork Thu May 11 17:11:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaron Merey X-Patchwork-Id: 69174 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 26D6C3856DFC for ; Thu, 11 May 2023 17:12:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 26D6C3856DFC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1683825126; bh=YDstGPxtiOTEwh+41ZdHapaSRUZ04AjrN52sDfjjXRw=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=kkoA1cbyvEyhkOGRA5Y7+rR7l/NCoJRbHFV/iKIrABzl9qIj4yOTgvjWiW4+/UxKy 5Cc1tUYPa5HfsFxa0un4zInDmaJzYdgXi7ikMepIRMcGQM12va/aDE11bWEYzX36gD JEYOQJAlS/Z/NU/f7tin1TGIn7LRS52Wjm5XMRT0= 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.129.124]) by sourceware.org (Postfix) with ESMTPS id 6EEAB3858C5F for ; Thu, 11 May 2023 17:11:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6EEAB3858C5F Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-443-7XkUfwD0PNirtw3NXnTAtQ-1; Thu, 11 May 2023 13:11:37 -0400 X-MC-Unique: 7XkUfwD0PNirtw3NXnTAtQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20D1085C088 for ; Thu, 11 May 2023 17:11:37 +0000 (UTC) Received: from localhost.localdomain (unknown [10.22.16.227]) by smtp.corp.redhat.com (Postfix) with ESMTP id E400363F99; Thu, 11 May 2023 17:11:36 +0000 (UTC) To: gdb-patches@sourceware.org Cc: Aaron Merey Subject: [OB PATCH][PUSHED] gdb/testsuite: Match file size in gdb.debuginfod/crc_mismatch.exp Date: Thu, 11 May 2023 13:11:15 -0400 Message-Id: <20230511171115.193908-1-amerey@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-11.2 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, SPF_HELO_NONE, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE 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: Aaron Merey via Gdb-patches From: Aaron Merey Reply-To: Aaron Merey Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" gdb's debuginfod progress messages include the size of the file being downloaded if the size information is available at the time the message is printed. For example: Downloading 10 MB separate debug info for /lib64/libxyz.so This size information is omitted if it's not available at the time of printing: Downloading separate debug info for /lib64/libxyz.so A pattern in crc_mismatch.exp fails to be matched if a progress message includes a file size. Add a wildcard to the pattern so that it matches the progress message whether or not it includes a file size. --- gdb/testsuite/gdb.debuginfod/crc_mismatch.exp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp index 36d008b8930..588fb7e7277 100644 --- a/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp +++ b/gdb/testsuite/gdb.debuginfod/crc_mismatch.exp @@ -97,7 +97,7 @@ proc_with_prefix local_debuginfod { } { gdb_test "file [standard_output_file crc_mismatch-2]" \ [multi_line \ "Reading symbols from ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \ - "Downloading separate debug info for ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \ + "Downloading.*separate debug info for ${escapedobjdirsubdir}/crc_mismatch-2\\.\\.\\." \ "Reading symbols from ${cache}/\[^\r\n\]+\\.\\.\\.(?:\r\nExpanding full symbols from \[^\r\n\]+)*"] \ "debuginfod running, info downloaded, no CRC mismatch" }