public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* [PATCH] [testsuite] Fix pretty printers regexps for GDB output
@ 2024-01-24 10:47 Christophe Lyon
  2024-01-24 11:01 ` Jonathan Wakely
  0 siblings, 1 reply; 6+ messages in thread
From: Christophe Lyon @ 2024-01-24 10:47 UTC (permalink / raw)
  To: gcc-patches, libstdc++, tom, jwakely; +Cc: Christophe Lyon

GDB emits end of lines as \r\n, we currently match the reverse \n\r,
possibly leading to mismatches under racy conditions.

I noticed this while running the GCC testsuite using the equivalent of
GDB's READ1 feature [1] which helps detecting bufferization issues.

Adjusting the first regexp to match the right order implied fixing the
second one, to skip the empty lines.

Tested on aarch64-linux-gnu.

[1] https//github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/README#L269

2024-01-24  Christophe Lyon  <christophe.lyon@linaro.org>

	libstdc++-v3/
	* testsuite/lib/gdb-test.exp (gdb-test): Fix regexps.
---
 libstdc++-v3/testsuite/lib/gdb-test.exp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/testsuite/lib/gdb-test.exp b/libstdc++-v3/testsuite/lib/gdb-test.exp
index 31206f2fc32..0de8d9ee153 100644
--- a/libstdc++-v3/testsuite/lib/gdb-test.exp
+++ b/libstdc++-v3/testsuite/lib/gdb-test.exp
@@ -194,7 +194,7 @@ proc gdb-test { marker {selector {}} {load_xmethods 0} } {
 
     set test_counter 0
     remote_expect target [timeout_value] {
-	-re {^(type|\$([0-9]+)) = ([^\n\r]*)[\n\r]+} {
+	-re {^(type|\$([0-9]+)) = ([^\n\r]*)\r\n} {
 	    send_log "got: $expect_out(buffer)"
 
 	    incr test_counter
@@ -250,7 +250,7 @@ proc gdb-test { marker {selector {}} {load_xmethods 0} } {
 	    return
 	}
 
-	-re {^[^$][^\n\r]*[\n\r]+} {
+	-re {^[\r\n]*[^$][^\n\r]*\r\n} {
 	    send_log "skipping: $expect_out(buffer)"
 	    exp_continue
 	}
-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-04-11 11:01 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-24 10:47 [PATCH] [testsuite] Fix pretty printers regexps for GDB output Christophe Lyon
2024-01-24 11:01 ` Jonathan Wakely
2024-01-25 15:54   ` Christophe Lyon
2024-02-06  9:26     ` Christophe Lyon
2024-04-10 13:43       ` Christophe Lyon
2024-04-11 11:01     ` Jonathan Wakely

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).