From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id TLCpHQGlwWBUFwAAWB0awg (envelope-from ) for ; Thu, 10 Jun 2021 01:37:05 -0400 Received: by simark.ca (Postfix, from userid 112) id 69E611F163; Thu, 10 Jun 2021 01:37:05 -0400 (EDT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,RDNS_DYNAMIC,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (ip-8-43-85-97.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 9F0061E813 for ; Thu, 10 Jun 2021 01:37:03 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 228B9389442A for ; Thu, 10 Jun 2021 05:37:03 +0000 (GMT) Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 7D9D93857C61 for ; Thu, 10 Jun 2021 05:36:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7D9D93857C61 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 580E4218DF for ; Thu, 10 Jun 2021 05:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1623303411; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=C3rFvcQ5KOabV7W5UXk6G7sjKIRc+R/HaubZq5sbQXs=; b=ZuF6ZIB9tsmcWFHazz0G2dzV4ZieMYba+jXlZ/Ev+SpOIWcvHb9+bESwp6/tBaE4sQVSLz uzDBQICz7vXJRfh6i2TCCh5PiqsGPIUUmCDzd+UCTKZhDf7riJNraMKDqlSxSDu9hXwRVy hyoTqFlVNa0JtK5ylhRKnfLFQr3PiQ8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1623303411; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=C3rFvcQ5KOabV7W5UXk6G7sjKIRc+R/HaubZq5sbQXs=; b=f/+nQ8gFfILZdCNIlOxe6yeBpcRFihYNj9zGC51wIz4fSPeIrzd/gy4XwfMXwxQ1ZDC3Ud BwdGJR0H67+qSGCw== Received: from imap3-int (imap-alt.suse-dmz.suse.de [192.168.254.47]) by imap.suse.de (Postfix) with ESMTP id 2CBEE118DD for ; Thu, 10 Jun 2021 05:36:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1623303411; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=C3rFvcQ5KOabV7W5UXk6G7sjKIRc+R/HaubZq5sbQXs=; b=ZuF6ZIB9tsmcWFHazz0G2dzV4ZieMYba+jXlZ/Ev+SpOIWcvHb9+bESwp6/tBaE4sQVSLz uzDBQICz7vXJRfh6i2TCCh5PiqsGPIUUmCDzd+UCTKZhDf7riJNraMKDqlSxSDu9hXwRVy hyoTqFlVNa0JtK5ylhRKnfLFQr3PiQ8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1623303411; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type; bh=C3rFvcQ5KOabV7W5UXk6G7sjKIRc+R/HaubZq5sbQXs=; b=f/+nQ8gFfILZdCNIlOxe6yeBpcRFihYNj9zGC51wIz4fSPeIrzd/gy4XwfMXwxQ1ZDC3Ud BwdGJR0H67+qSGCw== Received: from director2.suse.de ([192.168.254.72]) by imap3-int with ESMTPSA id TTDgCPOkwWDfSQAALh3uQQ (envelope-from ) for ; Thu, 10 Jun 2021 05:36:51 +0000 Date: Thu, 10 Jun 2021 07:36:49 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.cp/cplusfuncs.exp with check-read1 Message-ID: <20210610053648.GA24229@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+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When running check-read1, we run into: ... FAIL: gdb.cp/cplusfuncs.exp: info function for "operator=(" (timeout) ... Fix this by using using gdb_test_lines in info_func_regexp. Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.cp/cplusfuncs.exp with check-read1 gdb/testsuite/ChangeLog: 2021-06-09 Tom de Vries * gdb.cp/cplusfuncs.exp (info_func_regexp): Use gdb_test_lines. --- gdb/testsuite/gdb.cp/cplusfuncs.exp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.cp/cplusfuncs.exp b/gdb/testsuite/gdb.cp/cplusfuncs.exp index f1c2ff4907f..19be8abc2ac 100644 --- a/gdb/testsuite/gdb.cp/cplusfuncs.exp +++ b/gdb/testsuite/gdb.cp/cplusfuncs.exp @@ -287,13 +287,16 @@ proc probe_demangler { } { # proc info_func_regexp { name demangled } { - global gdb_prompt + global srcfile decimal regsub {\\\(void\\\)} $demangled {\(\)} demangled - gdb_test "info function $name" \ - "File .*:\t(class|)${demangled}.*" \ - "info function for \"$name\"" + set file_re "File .*[string_to_regexp $srcfile]:" + + gdb_test_lines "info function $name" "info function for \"$name\"" \ + [list \ + "$file_re" \ + "$decimal:\t(class|)${demangled}.*"] } #