From patchwork Thu Oct 10 07:25:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 98641 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 4D8533857C5F for ; Thu, 10 Oct 2024 07:26:24 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id 6AB023858C2B for ; Thu, 10 Oct 2024 07:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6AB023858C2B Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 6AB023858C2B Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545115; cv=none; b=LziWe52zu3GYIz94DRCi8jTHWYxeukap9TIsFExNn0XhSij0FXrvN0kXStg2vGVTtODSY0T09DwM5+5a1hSyWZlScC7rSqgmSHAxkBjn6aanhoItHPEAHIDBVpFaJ3wifTK0lrXCJb9uLNth8gtDAw9iM7j9JCJ8DZahjexr4QM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545115; c=relaxed/simple; bh=cU2nDsrFILcxXSrd/bG/1A58juWctPeDeW3D72iZJwU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=XmXnCN8/BTVtzO7hHr+WEo6GW4ww46/XUcuR4g6bW1440KJqJgOprsDB5P8sriysq8hkApVl4ChvdRy5vQ5Ok+HIWRsDWCL27UE9QM97O+JQXNTnVgAot+2drzZGIQoS73vk0nlJEm8KpSH6k4fyWGYr36D2EMlOqdhXKiUGo/w= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 7B8421FE92 for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9jcCgY1gxFGzW1sgrfJEtK9a0sFJ7HDacAWlpmnq0mM=; b=Qc/28nycDioBL9tEhaOZ/RFOVSWJkc2pXAcs9gTKBUyYBcxuoKmBVqooWSt98yQWBMyiCB QmBkbs90wAIgq4NANjuZiZrtijTHJsQ10iDJeN5X2NvT/INWtYQYa0IOExaiyMTi0+Zi8t C5uhY0Njr79cm6NzuXldkci6VHQ2Bjc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9jcCgY1gxFGzW1sgrfJEtK9a0sFJ7HDacAWlpmnq0mM=; b=3fhpckSFI6DCWTlOJFNw/W6L+SFrRvtpnDaNQl+2dxsSF7g750TE2/VjzKB2qgjmKjgCAN nzn7ElfGmdWDmuBw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9jcCgY1gxFGzW1sgrfJEtK9a0sFJ7HDacAWlpmnq0mM=; b=Qc/28nycDioBL9tEhaOZ/RFOVSWJkc2pXAcs9gTKBUyYBcxuoKmBVqooWSt98yQWBMyiCB QmBkbs90wAIgq4NANjuZiZrtijTHJsQ10iDJeN5X2NvT/INWtYQYa0IOExaiyMTi0+Zi8t C5uhY0Njr79cm6NzuXldkci6VHQ2Bjc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9jcCgY1gxFGzW1sgrfJEtK9a0sFJ7HDacAWlpmnq0mM=; b=3fhpckSFI6DCWTlOJFNw/W6L+SFrRvtpnDaNQl+2dxsSF7g750TE2/VjzKB2qgjmKjgCAN nzn7ElfGmdWDmuBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 63F3013A6E for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id tmkFF1eBB2cqWgAAD6G6ig (envelope-from ) for ; Thu, 10 Oct 2024 07:25:11 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 1/5] [gdb/testsuite] Fix some test-cases for check-read1 (gdb_test_lines) Date: Thu, 10 Oct 2024 09:25:06 +0200 Message-Id: <20241010072510.25545-1-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SCC_5_SHORT_WORD_LINES, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I ran the testsuite in an environment simulating a stressed system in combination with check-read1. This exposes a few more FAILs. Fix some by using gdb_test_lines, as well as related gdb_get_lines. Tested on x86_64-linux. --- .../premature-dummy-frame-removal.exp | 14 ++-- gdb/testsuite/gdb.btrace/exception.exp | 28 ++++---- gdb/testsuite/gdb.cp/overload.exp | 69 +++++++++---------- gdb/testsuite/gdb.python/py-framefilter.exp | 22 +++--- gdb/testsuite/gdb.reverse/sigall-precsave.exp | 4 +- .../gdb.server/bkpt-other-inferior.exp | 30 ++++---- gdb/testsuite/gdb.server/ext-run.exp | 4 +- 7 files changed, 83 insertions(+), 88 deletions(-) base-commit: 1001055e3552760015661dd9b081435051fe1340 diff --git a/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp b/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp index 19e28bb6631..c813fbeb3d2 100644 --- a/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp +++ b/gdb/testsuite/gdb.base/premature-dummy-frame-removal.exp @@ -80,12 +80,10 @@ gdb_test_multiple "p some_func ()" "" { # debug, to format of which isn't fixed. All we care about is that # GDB is still running afterwards. # -# All of the debug output makes this really slow when testing with the -# special read1 version of expect, hence the timeout factor. -with_read1_timeout_factor 10 { - gdb_test_no_output "set debug frame on" - gdb_test "p some_func ()" ".*" \ - "repeat p some_func () with frame debug on" - gdb_test_no_output "set debug frame off" -} +gdb_test_no_output "set debug frame on" +gdb_test_lines "p some_func ()" \ + "repeat p some_func () with frame debug on" \ + ".*" +gdb_test_no_output "set debug frame off" + gdb_test "p 1 + 2 + 3" " = 6" diff --git a/gdb/testsuite/gdb.btrace/exception.exp b/gdb/testsuite/gdb.btrace/exception.exp index 61cc6c904b6..f27e40f2bcd 100755 --- a/gdb/testsuite/gdb.btrace/exception.exp +++ b/gdb/testsuite/gdb.btrace/exception.exp @@ -64,17 +64,17 @@ gdb_expect_list "flat" "\r\n$gdb_prompt $" [list \ ] # show the branch trace with calls indented -send_gdb "record function-call-history /c 1\n" -gdb_expect_list "indented" "\r\n$gdb_prompt $" [list \ - [multi_line \ - "1\tmain\\(\\)" \ - "2\t test\\(\\)" \ - "3\t foo\\(\\)" \ - "4\t bar\\(\\)" \ - "5\t bad\\(\\)\r" \ - ] "" \ - [multi_line \ - "\[0-9\]*\t test\\(\\)" \ - "\[0-9\]*\tmain\\(\\)" \ - ] "" \ - ] +set lines [gdb_get_lines "record function-call-history /c 1"] +set re1 \ + [multi_line \ + "1\tmain\\(\\)" \ + "2\t test\\(\\)" \ + "3\t foo\\(\\)" \ + "4\t bar\\(\\)" \ + "5\t bad\\(\\)\r"] +set re2 \ + [multi_line \ + "\[0-9\]*\t test\\(\\)" \ + "\[0-9\]*\tmain\\(\\)"] + +gdb_assert { [regexp $re1.*$re2 $lines] } "indented" diff --git a/gdb/testsuite/gdb.cp/overload.exp b/gdb/testsuite/gdb.cp/overload.exp index ef26ae57a7f..da9deefb790 100644 --- a/gdb/testsuite/gdb.cp/overload.exp +++ b/gdb/testsuite/gdb.cp/overload.exp @@ -89,42 +89,39 @@ set re_synth "foo & operator=\\(foo const ?&\\);" gdb_test "print foo_instance1" "\\$\[0-9\]+ = \{ifoo = 111, ccpfoo = 0x0\}" -gdb_test_multiple "ptype foo_instance1" "ptype foo_instance1" { - -re "type = $re_class${ws}$XX_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}$nl$gdb_prompt $" { - # gcc 2.95.3 -gstabs+, no "const" on "const char *" - # TODO: gdb.base/constvar.exp has XFAILed this kind of problem for a - # long time, but an XFAIL really needs an external bug report. - # -- chastain 2003-12-31 - # setup_xfail "*-*-*" - # fail "ptype foo_instance1" - # TODO: this should be a KFAIL. - pass "ptype foo_instance1 (shorter match)" - } - -re "type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}$nl$gdb_prompt $" { - # gcc 2.95.3 -gstabs+ if "const char *" ever gets fixed - pass "ptype foo_instance1" - } - -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$XX_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" { - # gcc 3.3.2 -gdwarf-2, "~foo(int)" - # TODO: kfail this - # kfail "gdb/1113" "ptype foo_instance1" - pass "ptype foo_instance1 (shorter match)" - } - -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" { - # gcc 3.3.2 -gdwarf-2, if the dtor bug gets fixed - # gcc HEAD -gdwarf-2 (abi-2) - # TODO: just pass this - pass "ptype foo_instance1 (shorter match)" - } - -re "type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}$nl$gdb_prompt $" { - # gcc 3.3.2 -gstabs+ - # TODO: enough with the "shorter match" - pass "ptype foo_instance1 (shorter match)" - } - -re "type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods${ws}$re_synth$nl\}$nl$gdb_prompt $" { - # gcc HEAD -gstabs+ (abi-2) - pass "ptype foo_instance1 (shorter match)" - } +set lines [gdb_get_lines "ptype foo_instance1"] +set test "ptype foo_instance1 output" +if { [regexp "^type = $re_class${ws}$XX_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}\r\n$" $lines] } { + # gcc 2.95.3 -gstabs+, no "const" on "const char *" + # TODO: gdb.base/constvar.exp has XFAILed this kind of problem for a + # long time, but an XFAIL really needs an external bug report. + # -- chastain 2003-12-31 + # setup_xfail "*-*-*" + # fail "ptype foo_instance1" + # TODO: this should be a KFAIL. + pass "$test (shorter match)" +} elseif { [regexp "^type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_dtor${ws}$re_ctor${ws}$re_methods$nl\}\r\n$" $lines] } { + # gcc 2.95.3 -gstabs+ if "const char *" ever gets fixed + pass "$test" +} elseif { [regexp "^type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$XX_dtor${ws}$re_methods$nl\}\r\n$" $lines] } { + # gcc 3.3.2 -gdwarf-2, "~foo(int)" + # TODO: kfail this + # kfail "gdb/1113" "ptype foo_instance1" + pass "$test (shorter match)" +} elseif { [regexp "^type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}\r\n$" $lines] } { + # gcc 3.3.2 -gdwarf-2, if the dtor bug gets fixed + # gcc HEAD -gdwarf-2 (abi-2) + # TODO: just pass this + pass "$test (shorter match)" +} elseif { [regexp "^type = $re_class${ws}$re_fields${ws}$re_synth${ws}$re_ctor${ws}$re_dtor${ws}$re_methods$nl\}\r\n$" $lines] } { + # gcc 3.3.2 -gstabs+ + # TODO: enough with the "shorter match" + pass "$test (shorter match)" +} elseif { [regexp "^type = $re_class${ws}$re_fields${ws}$re_ctor${ws}$re_dtor${ws}$re_methods${ws}$re_synth$nl\}\r\n$" $lines] } { + # gcc HEAD -gstabs+ (abi-2) + pass "$test (shorter match)" +} else { + fail $test } # Print variables and method calls. diff --git a/gdb/testsuite/gdb.python/py-framefilter.exp b/gdb/testsuite/gdb.python/py-framefilter.exp index 374d352c981..3a325bd6e0b 100644 --- a/gdb/testsuite/gdb.python/py-framefilter.exp +++ b/gdb/testsuite/gdb.python/py-framefilter.exp @@ -82,11 +82,10 @@ gdb_breakpoint [gdb_get_line_number "Inner test breakpoint"] gdb_continue_to_breakpoint "Inner test breakpoint" # Test multiple local blocks. -gdb_test "bt full no-filters" \ +gdb_test_lines "bt full no-filters" "" \ ".*#0.*end_func.*h = 9.*f = 42.*g = 19.*bar = $hex \"Inside block x2\".*d = 15.*e = 14.*foo = $hex \"Inside block\".*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*" -gdb_test "bt full" \ - ".*#0.*cnuf_dne.*h = 9.*f = 42.*g = 19.*bar = $hex \"Inside block x2\".*d = 15.*e = 14.*foo = $hex \"Inside block\".*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*" \ - "bt full with filters" +gdb_test_lines "bt full" "bt full with filters" \ + ".*#0.*cnuf_dne.*h = 9.*f = 42.*g = 19.*bar = $hex \"Inside block x2\".*d = 15.*e = 14.*foo = $hex \"Inside block\".*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*" # Test pagination can be aborted even for frame filters. gdb_test_no_output "set height 5" "pagination quit - set height limited" @@ -161,15 +160,12 @@ gdb_test "bt -2" \ gdb_test "bt 3" \ ".*#0.*end_func.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\)\[^#\]*More stack frames follow.*" \ "bt 3 with frame-filter Reverse disabled" -gdb_test "bt no-filter full" \ - ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*" \ - "bt no-filters full with Reverse disabled" -gdb_test "bt full" \ - ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\).*#23.*in func2 \\(f=3\\).*elided = $hex \"Elided frame\".*fb = \{nothing = $hex \"Elided Foo Bar\", f = 84, s = 38\}.*bf = $hex.*" \ - "bt full with Reverse disabled" -gdb_test "bt full hide" \ - ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\)\[^#\]*#24.*in func3 \\(i=3\\).*" \ - "bt full hide with Reverse disabled" +gdb_test_lines "bt no-filter full" "bt no-filters full with Reverse disabled" \ + ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*" +gdb_test_lines "bt full" "bt full with Reverse disabled" \ + ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\).*#23.*in func2 \\(f=3\\).*elided = $hex \"Elided frame\".*fb = \{nothing = $hex \"Elided Foo Bar\", f = 84, s = 38\}.*bf = $hex.*" +gdb_test_lines "bt full hide" "bt full hide with Reverse disabled" \ + ".*#0.*end_func.*str = $hex \"The End\".*st2 = $hex \"Is Near\".*b = 12.*c = 5.*#1.*in funca \\(\\).*#2.*in funcb \\(j=10\\).*bar = \{a = 42, b = 84\}.*#22.*in func1 \\(\\)\[^#\]*#24.*in func3 \\(i=3\\).*" # Re-enable Reverse gdb_test_no_output "enable frame-filter global Reverse" \ diff --git a/gdb/testsuite/gdb.reverse/sigall-precsave.exp b/gdb/testsuite/gdb.reverse/sigall-precsave.exp index aab4551c874..902772a4ef1 100644 --- a/gdb/testsuite/gdb.reverse/sigall-precsave.exp +++ b/gdb/testsuite/gdb.reverse/sigall-precsave.exp @@ -155,7 +155,7 @@ gdb_test "break $breakloc" \ "breakpoint at end of main" # Signal handlers must be disabled -gdb_test "handle all nostop noprint" +gdb_test_lines "handle all nostop noprint" "" "" # The list of signals that the program generates, in the order they # are generated. @@ -276,7 +276,7 @@ gdb_test "record restore $precsave" \ "reload precord save file" # Signal handlers must be re-enabled -gdb_test "handle all stop print" +gdb_test_lines "handle all stop print" "" "" # Make the first signal SIGABRT because it is always supported. set sig_supported 1 diff --git a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp index 78d1ae029cb..46c07d1926a 100644 --- a/gdb/testsuite/gdb.server/bkpt-other-inferior.exp +++ b/gdb/testsuite/gdb.server/bkpt-other-inferior.exp @@ -77,19 +77,23 @@ foreach inf_sel {1 2} { gdb_test_no_output "set debug remote 1" - gdb_test_multiple "break -q main" "set breakpoint" { - -re "Sending packet: \\\$qXfer:auxv:read.*$gdb_prompt $" { - # Symbol lookup may access the target to read AUXV in - # order to determine the debug base for SVR4 linker - # namespaces. - xfail "$gdb_test_name" - } - -re "Sending packet.*$gdb_prompt $" { - fail "$gdb_test_name" - } - -re "^break -q main\r\nBreakpoint .* at .*$gdb_prompt $" { - pass "$gdb_test_name" - } + set lines [gdb_get_lines "break -q main"] + + set test "set breakpoint" + set re_xfail \ + [string_to_regexp {Sending packet: $qXfer:auxv:read}] + if { [regexp $re_xfail $lines] } { + # Symbol lookup may access the target to read AUXV in + # order to determine the debug base for SVR4 linker + # namespaces. + xfail $test + } elseif { [regexp "Sending packet:" $lines] } { + fail $test + } else { + set re \ + "Breakpoint $decimal at $hex: \[^\r\n\]+" + set re "^$re\r\n$" + gdb_assert { [regexp $re $lines] } $test } gdb_test_no_output "set debug remote 0" diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp index 6f7b5bdf446..296af984703 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -58,8 +58,8 @@ if { [istarget *-*-linux*] } { if { $do_xml_test } { # This is done in a way to avoid the timeout that can occur from # applying .* regexp to large output. - gdb_test_sequence "info os processes" "get process list" \ - { "pid +user +command" "1 +root +\[/a-z\]*(init|systemd|bash)" } + gdb_test_lines "info os processes" "get process list" \ + "^pid +user +command.*\r\n1 +root +\[/a-z\]*(init|systemd|bash)" } } From patchwork Thu Oct 10 07:25:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 98639 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 201D53857B8C for ; Thu, 10 Oct 2024 07:25:58 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by sourceware.org (Postfix) with ESMTPS id 8CD543858405 for ; Thu, 10 Oct 2024 07:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8CD543858405 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8CD543858405 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; cv=none; b=BZC0Iz/1T4lHnLJMrIOWNGwkMrg8wsNfaenVVBu4exKDFpXLwYJtwZAkHVoBHXU7bDx630GjzlxSpNiL1XjT/BunVQfl5FCH1xDsi56isH+9VthVBJ8Hv6znvY6q/s4g1Vdu2hR7knC16hDO/a7Uzjb9affYIU5+lHLwnwUxDSM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; c=relaxed/simple; bh=lPlEG+A/qrYZXSnIWCzPHG3FkCx0V/1zrnW8dEQLUys=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Y6DGdhBW6PDkBwmUuLlY8cBnd9fDeqWTaSu3peD0ZkJnpTOtwpbAj7ujvZgcIk7pu/X2paTJIhbS5jEKmcKpIyppgUqsi9xcbQcac68Y1GclShJn40pBNKwEWYZSpL36oDQZ3spRKGksta3IbMGFHEHJLaKAzA6t2cNgRDSJzuI= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id A99851FEC9 for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=5Wu3PD29ZPzM91ExF2aJGBAts+YAsOehAF5/NC2FpLs=; b=mBrvPRlUEwBo+IQg0Mmc8eduvyz/3GNcSTP2OKuS6rFdw7H2LwrAaLMDXkm1O6IaaEc/OE 3ZqeCQe2ifCxzfMWgefumx97vDK34g+qzdgQZ+UovI5t33IEV6YiuLkauvVl9JTS6YGziQ oedi8eK4k6RbKk9cdZDIpMrkWy3f3lY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=5Wu3PD29ZPzM91ExF2aJGBAts+YAsOehAF5/NC2FpLs=; b=a+CMP04qeFolYha0hzgro5Tgi5e6WjF7dnfJqXmZ351NomU5PT7oq7jX9G7mHU15iQqkZo PjcoodpWtKzDCzAQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=5Wu3PD29ZPzM91ExF2aJGBAts+YAsOehAF5/NC2FpLs=; b=mBrvPRlUEwBo+IQg0Mmc8eduvyz/3GNcSTP2OKuS6rFdw7H2LwrAaLMDXkm1O6IaaEc/OE 3ZqeCQe2ifCxzfMWgefumx97vDK34g+qzdgQZ+UovI5t33IEV6YiuLkauvVl9JTS6YGziQ oedi8eK4k6RbKk9cdZDIpMrkWy3f3lY= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=5Wu3PD29ZPzM91ExF2aJGBAts+YAsOehAF5/NC2FpLs=; b=a+CMP04qeFolYha0hzgro5Tgi5e6WjF7dnfJqXmZ351NomU5PT7oq7jX9G7mHU15iQqkZo PjcoodpWtKzDCzAQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 8288F13A70 for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id eKJ7HleBB2cqWgAAD6G6ig (envelope-from ) for ; Thu, 10 Oct 2024 07:25:11 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 2/5] [gdb/testsuite] Fix some test-cases for check-read1 (pipe/grep) Date: Thu, 10 Oct 2024 09:25:07 +0200 Message-Id: <20241010072510.25545-2-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241010072510.25545-1-tdevries@suse.de> References: <20241010072510.25545-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Score: -2.80 X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: X-Spam-Status: No, score=-12.4 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I ran the testsuite in an environment simulating a stressed system in combination with check-read1. This exposes a few more FAILs. Fix some by using pipe / grep to filter out unnecessary output. Tested on x86_64-linux. --- .../gdb.base/breakpoint-in-ro-region.exp | 2 +- gdb/testsuite/gdb.base/charset.exp | 17 ++++++++++++++--- gdb/testsuite/gdb.base/corefile.exp | 19 ++++++++++++------- gdb/testsuite/gdb.base/osabi.exp | 3 ++- .../gdb.base/sss-bp-on-user-bp-2.exp | 2 +- gdb/testsuite/gdb.threads/corethreads.exp | 6 ++++-- 6 files changed, 34 insertions(+), 15 deletions(-) diff --git a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp index b0a51961870..21cc7ff5133 100644 --- a/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp +++ b/gdb/testsuite/gdb.base/breakpoint-in-ro-region.exp @@ -43,7 +43,7 @@ proc probe_target_hardware_step {} { gdb_test_no_output "set debug target 1" set test "probe target hardware step" - gdb_test_multiple "si" $test { + gdb_test_multiple "pipe si | grep resume" $test { -re "resume \\(\[^\r\n\]+, step, .*$gdb_prompt $" { set hw_step 1 pass $test diff --git a/gdb/testsuite/gdb.base/charset.exp b/gdb/testsuite/gdb.base/charset.exp index babfa285c94..0d39d04bc87 100644 --- a/gdb/testsuite/gdb.base/charset.exp +++ b/gdb/testsuite/gdb.base/charset.exp @@ -87,9 +87,20 @@ if {[lsearch -exact $show_charset $show_host_charset] >= 0} { } # Try a malformed `set charset'. -gdb_test "set charset" \ - "Requires an argument. Valid arguments are.*" \ - "try malformed `set charset'" +set cmd "set charset" +set ok 0 +gdb_test_multiple $cmd "try malformed `set charset'" { + -re "^$cmd\r\nRequires an argument. Valid arguments are " { + set ok 1 + exp_continue + } + -re ", " { + exp_continue + } + -re -wrap "" { + gdb_assert { $ok } $gdb_test_name + } +} # Try using `set host-charset' on an invalid character set. gdb_test "set host-charset my_grandma_bonnie" \ diff --git a/gdb/testsuite/gdb.base/corefile.exp b/gdb/testsuite/gdb.base/corefile.exp index f4f102a156b..dc3c8b1dfc8 100644 --- a/gdb/testsuite/gdb.base/corefile.exp +++ b/gdb/testsuite/gdb.base/corefile.exp @@ -266,7 +266,10 @@ proc corefile_test_run {} { clean_restart $::binfile gdb_test "core-file $corefile" "Core was generated by .*" "run: load core again" - gdb_test "info files" "\r\nLocal core dump file:\r\n.*" "run: sanity check we see the core file" + set re "Local core dump file:" + gdb_test "pipe info files | grep \"$re\"" \ + "Local core dump file:" \ + "run: sanity check we see the core file" set test "run: with core" if [runto_main] { @@ -276,11 +279,12 @@ proc corefile_test_run {} { } set test "run: core file is cleared" - gdb_test_multiple "info files" $test { - -re "\r\nLocal core dump file:\r\n.*\r\n$gdb_prompt $" { + set re "Local core dump file:" + gdb_test_multiple "pipe info files | grep \"$re\"" $test { + -re -wrap $re { fail $test } - -re "\r\n$gdb_prompt $" { + -re -wrap "" { pass $test } } @@ -349,11 +353,12 @@ proc corefile_test_attach {} { gdb_test "attach $pid" "Attaching to process $pid\r\n.*" "attach: with core" set test "attach: core file is cleared" - gdb_test_multiple "info files" $test { - -re "\r\nLocal core dump file:\r\n.*\r\n$gdb_prompt $" { + set re "Local core dump file:" + gdb_test_multiple "pipe info files | grep \"$re\"" $test { + -re -wrap $re { fail $test } - -re "\r\n$gdb_prompt $" { + -re -wrap "" { pass $test } } diff --git a/gdb/testsuite/gdb.base/osabi.exp b/gdb/testsuite/gdb.base/osabi.exp index 9bbfff52bae..4fd267bdbf4 100644 --- a/gdb/testsuite/gdb.base/osabi.exp +++ b/gdb/testsuite/gdb.base/osabi.exp @@ -24,7 +24,8 @@ require !gdb_debug_enabled proc test_set_osabi_none { } { clean_restart gdb_test_no_output "set debug arch 1" - gdb_test "set osabi none" ".*gdbarch_find_by_info: info.osabi 1 \\(none\\).*" + gdb_test "pipe set osabi none | grep gdbarch_find_by_info" \ + ".*gdbarch_find_by_info: info.osabi 1 \\(none\\).*" } test_set_osabi_none diff --git a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp index 773afa793a0..226a756c765 100644 --- a/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp +++ b/gdb/testsuite/gdb.base/sss-bp-on-user-bp-2.exp @@ -64,7 +64,7 @@ delete_breakpoints gdb_test_no_output "set debug target 1" set hardware_step 0 set test "probe target hardware step" -gdb_test_multiple "si" $test { +gdb_test_multiple "pipe si | grep resume" $test { -re "resume \\(\[^\r\n\]+, step, .*$gdb_prompt $" { set hardware_step 1 pass $test diff --git a/gdb/testsuite/gdb.threads/corethreads.exp b/gdb/testsuite/gdb.threads/corethreads.exp index dfaca828a45..41759486046 100644 --- a/gdb/testsuite/gdb.threads/corethreads.exp +++ b/gdb/testsuite/gdb.threads/corethreads.exp @@ -35,8 +35,10 @@ if {$corefile == ""} { clean_restart $executable gdb_test "core-file $corefile" "Core was generated by .*" "load core" -gdb_test "info files" "\r\nLocal core dump file:\r\n.*" "sanity check we see the core file" - +set re "Local core dump file:" +gdb_test "pipe info files | grep \"$re\"" \ + $re \ + "sanity check we see the core file" set test "print pthread_t of thread0" gdb_test_multiple "p/x thread0" $test { -re " = (0x\[0-9a-f\]+)\r\n$gdb_prompt $" { From patchwork Thu Oct 10 07:25:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 98637 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 3A3CB3857BA9 for ; Thu, 10 Oct 2024 07:25:47 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by sourceware.org (Postfix) with ESMTPS id A7B973858423 for ; Thu, 10 Oct 2024 07:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A7B973858423 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A7B973858423 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=195.135.223.130 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; cv=none; b=qfybEXhnd0rhGylCYlooWT21HZSdFJpDV4R7dk6GpTPV63aaiOsfRP3DeqM3opHO7jLyxaL7ZlIDe0x02iNOOuNXZDeTHUt+X97fPDtK5J+SSb4LG0yvMSp7pjlu5b96asDafRvHZwcHQkHeJQ4JUB0uB1+q6HzD91mw4BIRINE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; c=relaxed/simple; bh=c2Bz30+5hKVevSlmctnhmANyLlDHf+ISruk2W/Xi72Y=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=RI5tDNmP0Jq7k9JANSx9DCbLDza+5CN8qyZeEdjUoOas7A9QLbrAbHGk3y2se/qjheNGxRHhsTplavmOASYAX5hDd93FanLGA3rnh3DIBkOFDGxzBj7rfrNJeAskK1uOUAqJTrviSed8LxBBOHeWOL1w3AK99EdBH1/g+wyEi40= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B73F621F7C for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=hyvER5jM5EchiFo3qNikRI9Z7jyharReaVnPMlw68Uw=; b=woYZIzDVN/U+QiMH+dwufqEMwxmLrEoSn46SVlUy3fiNqNYiZVH3K79akvzvHgSlc3Shc0 GwYc/MkcVDM75kqAadOaCdaU6lHz8stgqNR88XEVobPEnQ5KnUVDdV5KcRKEU/0NjXnerc wr7a6ccHYhDD9fSd12srIhShAJtdVE0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=hyvER5jM5EchiFo3qNikRI9Z7jyharReaVnPMlw68Uw=; b=7eDaOnBQjeEFt3+nIw67q+vvOXT3wb0l4bGhYdn4eChcVSbQM8Hf5rQqGu3cLP84a9gp3n J8p71rfGdzWCD4Dg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=woYZIzDV; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=7eDaOnBQ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=hyvER5jM5EchiFo3qNikRI9Z7jyharReaVnPMlw68Uw=; b=woYZIzDVN/U+QiMH+dwufqEMwxmLrEoSn46SVlUy3fiNqNYiZVH3K79akvzvHgSlc3Shc0 GwYc/MkcVDM75kqAadOaCdaU6lHz8stgqNR88XEVobPEnQ5KnUVDdV5KcRKEU/0NjXnerc wr7a6ccHYhDD9fSd12srIhShAJtdVE0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=hyvER5jM5EchiFo3qNikRI9Z7jyharReaVnPMlw68Uw=; b=7eDaOnBQjeEFt3+nIw67q+vvOXT3wb0l4bGhYdn4eChcVSbQM8Hf5rQqGu3cLP84a9gp3n J8p71rfGdzWCD4Dg== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 9FC2013AA3 for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cDWUJVeBB2cqWgAAD6G6ig (envelope-from ) for ; Thu, 10 Oct 2024 07:25:11 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 3/5] [gdb/testsuite] Fix some test-cases for check-read1 (-lbl) Date: Thu, 10 Oct 2024 09:25:08 +0200 Message-Id: <20241010072510.25545-3-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241010072510.25545-1-tdevries@suse.de> References: <20241010072510.25545-1-tdevries@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: B73F621F7C X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo, imap1.dmz-prg2.suse.org:rdns, suse.de:dkim, suse.de:mid] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-Spam-Score: -3.01 X-Spam-Status: No, score=-12.4 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org I ran the testsuite in an environment simulating a stressed system in combination with check-read1. This exposes a few more FAILs. Fix some by using -lbl. Tested on x86_64-linux. --- gdb/testsuite/gdb.base/sect-cmd.exp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.base/sect-cmd.exp b/gdb/testsuite/gdb.base/sect-cmd.exp index 7d52e317167..2a5758a94c6 100644 --- a/gdb/testsuite/gdb.base/sect-cmd.exp +++ b/gdb/testsuite/gdb.base/sect-cmd.exp @@ -35,12 +35,19 @@ set address1 "" set address2 "" set section_name "" -gdb_test_multiple "info files" "" { - -re -wrap "\\s+($hex) - ($hex) is (\\\$CODE\\\$|\\.text\\S*) in .*" { - set address1 $expect_out(1,string) - set address2 $expect_out(2,string) - set section_name $expect_out(3,string) - pass $gdb_test_name +set ok 0 +gdb_test_multiple "info files" "" -lbl { + -re "\\s+($hex) - ($hex) is (\\\$CODE\\\$|\\.text\\S*) in .*" { + if { ! $ok } { + set address1 $expect_out(1,string) + set address2 $expect_out(2,string) + set section_name $expect_out(3,string) + set ok 1 + } + exp_continue + } + -re -wrap "" { + gdb_assert { $ok } $gdb_test_name } } @@ -56,7 +63,7 @@ if { $address1 == "" || $address2 == "" || $section_name == "" } { # set saw_section_address_line false gdb_test_multiple "section $section_name $address1" \ - "set section $section_name to original address" { + "set section $section_name to original address" -lbl { -re ".*$address1 \- $address2 is $section_name in \[^\r\n\]*" { set saw_section_address_line true exp_continue From patchwork Thu Oct 10 07:25:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 98640 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 69DD7385781A for ; Thu, 10 Oct 2024 07:26:17 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2a07:de40:b251:101:10:150:64:1]) by sourceware.org (Postfix) with ESMTPS id CB81E385843D for ; Thu, 10 Oct 2024 07:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CB81E385843D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CB81E385843D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:1 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; cv=none; b=xRT1AuFlsJblJVQZ/ek1MzjVFTviEfM2PYG9pjeBqSI345yCUWy3DGymlTlf8OHzayHp2KqSp9XO7dLsHRb9PQE+Wdimq4ybBkeddhlOEEniEcMimIE5wdewiPJGcZ2mmYo/bu9p78AjgPXKJzdvN1UE2akk0rc2P69VO6I7efw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; c=relaxed/simple; bh=1h/65SwiWTOeKF7o8NItch0d7y2Ee9jHFm3chbswreU=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=Vnn2urVw4/poSp8Qo3VOPNSlPfMXIXuLT5KHrQGvpFdjDQmWEsti43EC30oX5/Pm1vupXVIwAvEiBarpiomlSvvZeFCMHA5BLBu7wgMRaXfzQI4dxlQhr1K9sxF+RQDWgCsk8hl9bM9W2xA4M4Aot81yWyxU8MGabR1raZDrjfM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D3BBB21F8D for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=qrF7IcZlmbW/QXurtFoHCQHCn1q3rvWFdyDYEiWdqmw=; b=DUv2mwpvshIszR8jdjqdOcqrMYEx/yquAN/zERELUbkzFUlCXOdwZzwinx7cGeifmDnxN/ pAnyXQHrIWlgox7Wrxyu7y2xYzviFR2mwITtc3wh8Eg8ntfriYWTnScSC2thti29MaqE0m nj0Rhfz7cK9YgeZzJW1bWy++nS2eryk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=qrF7IcZlmbW/QXurtFoHCQHCn1q3rvWFdyDYEiWdqmw=; b=RfhzAy9JT8+WFoHe71siLVWz526OSRAiTgnBw5Y/Z7QU3qZpqCO7pxLkouBU0WUYN6ot8j gP6jgdV3/vaNiVAA== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=DUv2mwpv; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=RfhzAy9J DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=qrF7IcZlmbW/QXurtFoHCQHCn1q3rvWFdyDYEiWdqmw=; b=DUv2mwpvshIszR8jdjqdOcqrMYEx/yquAN/zERELUbkzFUlCXOdwZzwinx7cGeifmDnxN/ pAnyXQHrIWlgox7Wrxyu7y2xYzviFR2mwITtc3wh8Eg8ntfriYWTnScSC2thti29MaqE0m nj0Rhfz7cK9YgeZzJW1bWy++nS2eryk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=qrF7IcZlmbW/QXurtFoHCQHCn1q3rvWFdyDYEiWdqmw=; b=RfhzAy9JT8+WFoHe71siLVWz526OSRAiTgnBw5Y/Z7QU3qZpqCO7pxLkouBU0WUYN6ot8j gP6jgdV3/vaNiVAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id BD21413A6E for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id kMzGLFeBB2cqWgAAD6G6ig (envelope-from ) for ; Thu, 10 Oct 2024 07:25:11 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/5] [gdb/testsuite] Fix gdb.threads/ia64-sigill.exp with check-read1 Date: Thu, 10 Oct 2024 09:25:09 +0200 Message-Id: <20241010072510.25545-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241010072510.25545-1-tdevries@suse.de> References: <20241010072510.25545-1-tdevries@suse.de> MIME-Version: 1.0 X-Rspamd-Queue-Id: D3BBB21F8D X-Spam-Score: -3.01 X-Rspamd-Action: no action X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FUZZY_BLOCKED(0.00)[rspamd.com]; RBL_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; SPAMHAUS_XBL(0.00)[2a07:de40:b281:104:10:150:64:97:from]; TO_DN_NONE(0.00)[]; RECEIVED_SPAMHAUS_BLOCKED_OPENRESOLVER(0.00)[2a07:de40:b281:106:10:150:64:167:received]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:rdns, imap1.dmz-prg2.suse.org:helo, suse.de:mid, suse.de:dkim] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org X-Spam-Level: X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org Fix test-case gdb.threads/ia64-sigill.exp with make target check-read1 by using a custom line-by-line exp_continue clause: ... -re "\r\n\[^\r\n\]*(?=\r\n\[^\r\n\]*\r\n)" { exp_continue } ... which drops a line each time it finds two lines in the buffer. This allows the other clauses to use two-line patterns. Tested on x86_64-linux. --- gdb/testsuite/gdb.threads/ia64-sigill.exp | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.threads/ia64-sigill.exp b/gdb/testsuite/gdb.threads/ia64-sigill.exp index 05f998244f6..79233ee3bee 100644 --- a/gdb/testsuite/gdb.threads/ia64-sigill.exp +++ b/gdb/testsuite/gdb.threads/ia64-sigill.exp @@ -58,20 +58,35 @@ gdb_test_no_output "set debug infrun 1" # The ia64 SIGILL signal is visible only in the linux-nat debug output. set prompt "$gdb_prompt \\\[infrun\\\] fetch_inferior_event: exit\r\n$" +set ok 0 gdb_test_multiple "continue" "continue" -prompt $prompt { - -re "Breakpoint \[0-9\]+,( .* in)? thread_func .*$prompt$" { - pass $gdb_test_name + -re "Breakpoint \[0-9\]+,( \[^\r\n\]+ in)? thread_func \[^\r\n\]+" { + set ok 1 + exp_continue + } + -re -wrap "" { + gdb_assert { $ok } $gdb_test_name + } + -re "\r\n\[^\r\n\]*(?=\r\n\[^\r\n\]*\r\n)" { + exp_continue } } gdb_test_no_output {delete $sigill_bpnum} +set ok 0 gdb_test_multiple "continue" "continue for the pending signal" -prompt $prompt { - -re "Breakpoint \[0-9\]+, .*break-at-exit.*\r\n$prompt$" { + -re "Breakpoint \[0-9\]+, .*break-at-exit" { # Breakpoint has been skipped in the other thread. - pass $gdb_test_name + set ok 1 } -re " received signal .*\r\n$gdb_prompt $" { fail $gdb_test_name } + -re -wrap "" { + gdb_assert { $ok } $gdb_test_name + } + -re "\r\n\[^\r\n\]*(?=\r\n\[^\r\n\]*\r\n)" { + exp_continue + } } From patchwork Thu Oct 10 07:25:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 98638 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 1AF593857C6D for ; Thu, 10 Oct 2024 07:25:55 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2a07:de40:b251:101:10:150:64:2]) by sourceware.org (Postfix) with ESMTPS id D6196385843F for ; Thu, 10 Oct 2024 07:25:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D6196385843F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.de ARC-Filter: OpenARC Filter v1.0.0 sourceware.org D6196385843F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a07:de40:b251:101:10:150:64:2 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; cv=none; b=EceLiJbyxcXv8mOm2wk9Ya39UiSjC6M9ISfrmTr4eRgwx8U3Kuo5o4ONHI9A6EeoPjZX43SynS41iCbpVXegShTbFYxUsId/qnqtjK8Dvhzrmoaczh9l2nHvKqlyJlxX8IU4XEy4RvjDPzCxcw1RY5og+24U8EIPvYLNtzJ0vd8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1728545114; c=relaxed/simple; bh=8mfIILQ3jYumjomVJ8KzQBqQmd8gywZIOGotbF3e1NQ=; h=DKIM-Signature:DKIM-Signature:DKIM-Signature:DKIM-Signature:From: To:Subject:Date:Message-Id:MIME-Version; b=YxBjy/aqpkkvRgyp8pwiKoKFomkFD5dtGPF9K36qB1yAu480WFmU2xRDm7N7boBdxZDzAfTrmpEfKsx8CIA3CfmUiQD6RgImXH+kldmwYnZub7jJS/sjJSeldNKIbx7PdyaHlajXf33to7PXQKwOxA/d4p4Xa6JQ5owJHobc3cg= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id F230A1FECB for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545112; 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=2e81zRUXp+Lcs1tLWktUiYvOctJqMhlFoxTUyVB/HHc=; b=Q298WeUgotK27DuB9IyU1SoVUkM4EjbTiU5FoY5WXfynXvlqQBO1Tj2vQdHCD4sH3xIPwX bA/YqMd8RhKADZTNkPiFxhnGu3JxCqRbLmU1cFC0DzXZqJ6J3JuiKUGV5qgkYs4O63BEbd 3GX3p0kX0YPbGZRS/fM7k4zrAq3wzs4= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545112; 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=2e81zRUXp+Lcs1tLWktUiYvOctJqMhlFoxTUyVB/HHc=; b=GJ6pNgYZVu9+k8VxBZJF4OaXA/q89PgmkVuSoGjCsI54Kgynj3k8JZ4f0qwMG14hJBtn/q hL7LlZ5MoVrJGtBw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1728545111; 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=2e81zRUXp+Lcs1tLWktUiYvOctJqMhlFoxTUyVB/HHc=; b=1W/kPy93C0R884RqPIXKEe3NsEzIK9MrcxGeITn0P/DHznf9GtyKZ0qXcthq/GEDVjNEXH F5r+ZNBhMolri8zLXiBo8uFfKN0LDdfEFMzIN21tuSiVCBKk2e411kYjgIe67qaHDENF8q b8LgV57KzMaNZ+JTTc56mBYnHyx7sQE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1728545111; 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=2e81zRUXp+Lcs1tLWktUiYvOctJqMhlFoxTUyVB/HHc=; b=pkjfNismCkt1gDKXY4H3kOTI0T6G/Mdxunwol+80T5t48T/ypQ3vugsxy/y9dy+MPreXaQ 8rvZhnwQeZLlt0DQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id DB9F713A70 for ; Thu, 10 Oct 2024 07:25:11 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id cDAmNFeBB2cqWgAAD6G6ig (envelope-from ) for ; Thu, 10 Oct 2024 07:25:11 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 5/5] [gdb/testsuite] Fix gdb.cp/exceptprint.exp with check-read1 Date: Thu, 10 Oct 2024 09:25:10 +0200 Message-Id: <20241010072510.25545-5-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20241010072510.25545-1-tdevries@suse.de> References: <20241010072510.25545-1-tdevries@suse.de> MIME-Version: 1.0 X-Spam-Level: X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[99.99%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; FUZZY_BLOCKED(0.00)[rspamd.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:mid,imap1.dmz-prg2.suse.org:helo]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[gdb-patches@sourceware.org]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, 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 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gdb-patches-bounces~patchwork=sourceware.org@sourceware.org Fix test-case gdb.cp/exceptprint.exp with make target check-read1 by limiting the output of skip_libstdcxx_probe_tests_prompt by making the used command more precise: using "info probes stap libstdcxx" instead of "info probes". Tested on x86_64-linux. --- gdb/testsuite/lib/gdb.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index f0a89394b87..8f50a1c7bd8 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5066,7 +5066,8 @@ proc skip_unwinder_tests {} { proc skip_libstdcxx_probe_tests_prompt { prompt_regexp } { set supported 0 - gdb_test_multiple "info probe" "check for stap probe in libstdc++" \ + gdb_test_multiple "info probes stap libstdcxx" \ + "check for stap probe in libstdc++" \ -prompt "$prompt_regexp" { -re ".*libstdcxx.*catch.*\r\n$prompt_regexp" { set supported 1