From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id GNT7IMUmYGENDgAAWB0awg (envelope-from ) for ; Fri, 08 Oct 2021 07:08:53 -0400 Received: by simark.ca (Postfix, from userid 112) id 7C82D1EE20; Fri, 8 Oct 2021 07:08:53 -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,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 9D4A81E813 for ; Fri, 8 Oct 2021 07:08:52 -0400 (EDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 2ABA73857C72 for ; Fri, 8 Oct 2021 11:08:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2ABA73857C72 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1633691332; bh=ncU4tVRIssSEPijE3dxs0lJX/317o8C1yX9jqWft9Zg=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=FohXka1uP5Oj0HoFu5W7Q/z43TLdpjPyS2TOEgi9SkyszAXgz3PNLjmG1QxdjDwRl jHVx7Lm7CJ2GenKCRGKAi+3UbTqYySroF1j5mh9fdYkrZZykABSSvsfwvqHzg7ybRJ 0Fi2ATMVJAkS+rVnCUWqUO+987/z491/xRyDG8lo= Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 3F5FE3858431 for ; Fri, 8 Oct 2021 11:08:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 3F5FE3858431 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 6269821B97 for ; Fri, 8 Oct 2021 11:08:32 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 47EFC13EB2 for ; Fri, 8 Oct 2021 11:08:32 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 2A7bD7AmYGFaMQAAMHmgww (envelope-from ) for ; Fri, 08 Oct 2021 11:08:32 +0000 Date: Fri, 8 Oct 2021 13:08:30 +0200 To: gdb-patches@sourceware.org Subject: [committed][gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1 Message-ID: <20211008110829.GA27337@delia.home> 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: , From: Tom de Vries via Gdb-patches Reply-To: Tom de Vries Errors-To: gdb-patches-bounces+public-inbox=simark.ca@sourceware.org Sender: "Gdb-patches" Hi, When running test-case gdb.mi/gdb2549.exp with check-read1, I run into: ... FAIL: gdb.mi/gdb2549.exp: register values x (timeout) ... Fix this by applying the same fix as for "register values t" in commit 478e490a4df "[gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1". Tested on x86_64-linux. Committed to trunk. Thanks, - Tom [gdb/testsuite] Fix gdb.mi/gdb2549.exp with check-read1 --- gdb/testsuite/gdb.mi/gdb2549.exp | 46 ++++++++++++++++++---------------------- 1 file changed, 21 insertions(+), 25 deletions(-) diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp index aebf9c904d9..9cdc31e532c 100644 --- a/gdb/testsuite/gdb.mi/gdb2549.exp +++ b/gdb/testsuite/gdb.mi/gdb2549.exp @@ -43,42 +43,23 @@ proc register_tests_no_exec { } { "no executable" } -proc register_tests { } { - global hex - global decimal +proc register_test { n arg format } { global mi_gdb_prompt - set octal "\[0-7\]+" - set binary "\[0-1\]+" - set float "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))" - - mi_gdb_test "222-data-list-register-values x" \ - "222\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$hex\"\}.*\\\]" \ - "register values x" - - mi_gdb_test "333-data-list-register-values f" \ - "333\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$float\"\}.*\\\]" \ - "register values f" - - mi_gdb_test "444-data-list-register-values d" \ - "444\\^done,register-values=\\\[\{number=\"$decimal\",value=\"-?$decimal\"\}.*\\\]" \ - "register values d" + global decimal - mi_gdb_test "555-data-list-register-values o" \ - "555\\^done,register-values=\\\[\{number=\"$decimal\",value=\"$octal\"\}.*\\\]" \ - "register values o" + set cmd "$n-data-list-register-values $arg" + set test "register values $arg" - set cmd "666-data-list-register-values t" - set test "register values t" set state 0 gdb_test_multiple $cmd $test -prompt "$mi_gdb_prompt$" { - -re "666\\^done,register-values=\\\[" { + -re "$n\\^done,register-values=\\\[" { if { $state == 0 } { set state 1 exp_continue } fail $gdb_test_name } - -re "\{number=\"$decimal\",value=\"$binary\"\}" { + -re "\{number=\"$decimal\",value=\"$format\"\}" { if { $state != 0 } { set state 2 exp_continue @@ -98,6 +79,21 @@ proc register_tests { } { } } +proc register_tests { } { + global hex + global decimal + set octal "\[0-7\]+" + set binary "\[0-1\]+" + set float \ + "\\-?((\[0-9\]+(\\.\[0-9\]+)?(e\[-+\]\[0-9\]+)?)|(nan\\($hex\\)))" + + register_test 222 x $hex + register_test 333 f $float + register_test 444 d -?$decimal + register_test 555 o $octal + register_test 666 t $binary +} + mi_clean_restart $binfile register_tests_no_exec