From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 529E33858D32 for ; Fri, 31 Mar 2023 15:16:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 529E33858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de 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 83EF421A97 for ; Fri, 31 Mar 2023 15:16:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1680275768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mevBx0koHh8vu2+2mCuFOdAhCxfQg4CfKMgdLkzi8Gk=; b=aqhe2y9S08AP1rTMq0DKxSt+9NVvDkhdDdv6W3EE/zQUt9xA3FTZHrHMBgJnL588onfeGK k5rSH3Ne8obd21X11c59QyOcOkZCIEElBXqb7bARkql7GNS1KfjtJUKSxlKkS8tfH4IX4r E/LaQCR7nLr7vWpJyNBIEf5Ixa2cTLU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1680275768; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mevBx0koHh8vu2+2mCuFOdAhCxfQg4CfKMgdLkzi8Gk=; b=LoOUNWkvQpyGQ/bNxOGOjdzg9OpavZ6K1SQJewmrL2lmJLOTIiDSjKgUpnTKiHkg7DcMWh 615R8RtfTpE3AACQ== 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 6FC7C133B6 for ; Fri, 31 Mar 2023 15:16:08 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +KQgGjj5JmTEAwAAMHmgww (envelope-from ) for ; Fri, 31 Mar 2023 15:16:08 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [pushed 2/2] [gdb/testsuite] Fix gdb.base/trace-commands.exp with editing off Date: Fri, 31 Mar 2023 17:15:53 +0200 Message-Id: <20230331151553.7938-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230331151553.7938-1-tdevries@suse.de> References: <20230331151553.7938-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,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 List-Id: With test-case gdb.base/trace-commands.exp and editing off, I run into fails because multi-line commands are issued using gdb_test_sequence, which doesn't handle them correctly. Fix this by using gdb_test instead. Tested on x86_64-linux. PR testsuite/30288 Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30288 --- gdb/testsuite/gdb.base/trace-commands.exp | 67 ++++++++++++++--------- 1 file changed, 40 insertions(+), 27 deletions(-) diff --git a/gdb/testsuite/gdb.base/trace-commands.exp b/gdb/testsuite/gdb.base/trace-commands.exp index c37b6d99d08..c936d228097 100644 --- a/gdb/testsuite/gdb.base/trace-commands.exp +++ b/gdb/testsuite/gdb.base/trace-commands.exp @@ -69,27 +69,33 @@ gdb_test "show trace-commands" \ gdb_test "echo hi\\n" {\+echo hi\\n[\r\n]+hi} "simple trace-commands test" # Nested test -gdb_test_sequence "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend" \ - "nested trace-commands test" { - {[\r\n]\+if 1} - {[\r\n]\+\+set \$i = 0} - {[\r\n]\+\+while \$i < 5} - {[\r\n]\+\+\+func \$i} - {[\r\n]\+\+\+\+echo in func \$i\\n} - {[\r\n]\+\+\+set \$i \+= 1} - {[\r\n]\+\+\+func \$i} - {[\r\n]\+\+\+\+echo in func \$i\\n} - {[\r\n]\+\+\+set \$i \+= 1} - {[\r\n]\+\+\+func \$i} - {[\r\n]\+\+\+\+echo in func \$i\\n} - {[\r\n]\+\+\+set \$i \+= 1} - {[\r\n]\+\+\+func \$i} - {[\r\n]\+\+\+\+echo in func \$i\\n} - {[\r\n]\+\+\+set \$i \+= 1} - {[\r\n]\+\+\+func \$i} - {[\r\n]\+\+\+\+echo in func \$i\\n} - {[\r\n]\+\+\+set \$i \+= 1} +set strings { + {+if 1} + {++set $i = 0} + {++while $i < 5} + {+++func $i} + {++++echo in func $i\n} + {+++set $i += 1} + {+++func $i} + {++++echo in func $i\n} + {+++set $i += 1} + {+++func $i} + {++++echo in func $i\n} + {+++set $i += 1} + {+++func $i} + {++++echo in func $i\n} + {+++set $i += 1} + {+++func $i} + {++++echo in func $i\n} + {+++set $i += 1} +} +set re {} +foreach string $strings { + lappend re [string_to_regexp $string] } +set re [join $re "\r\n(.*\r\n)?"] +set cmd "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend" +gdb_test $cmd $re "nested trace-commands test" # Function with source works gdb_test_sequence "define topfunc\nsource $tracecommandsscript\nend" \ @@ -111,13 +117,20 @@ gdb_test_sequence "topfunc" "nested trace-commands test with source" { } # Test nest depth resets properly on error -gdb_test_sequence "if 1\nif 2\nload\necho should not get here\\n\nend\nend" \ - "depth resets on error part 1" { - {[\r\n]\+if 1} - {[\r\n]\+\+if 2} - {[\r\n]\+\+\+load} - {[\r\n]No executable file specified\.} - {[\r\n]Use the "file" or "exec-file" command\.} +set cmd "if 1\nif 2\nload\necho should not get here\\n\nend\nend" +set strings { + {+if 1} + {++if 2} + {+++load} + {No executable file specified.} + {Use the "file" or "exec-file" command.} +} +set re {} +foreach string $strings { + lappend re [string_to_regexp $string] } +set re [join $re "\r\n(.*\r\n)?"] +gdb_test $cmd $re "depth resets on error part 1" + gdb_test "echo hi\\n" {[\r\n]\+echo hi\\n[\r\n]+hi} \ "depth resets on error part 2" -- 2.35.3