From: Tom de Vries <tdevries@suse.de>
Date: Fri, 8 Oct 2021 10:30:35 +0000 (+0200)
Subject: [gdb/testsuite] Fix gdb.base/bt-on-error-and-warning.exp with check-read1
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8320b042306349336ac2441897401748c2674d6a;p=binutils-gdb.git

[gdb/testsuite] Fix gdb.base/bt-on-error-and-warning.exp with check-read1

When running test-case gdb.base/bt-on-error-and-warning.exp with check-read1,
I run into:
...
(gdb) maint internal-error foobar^M
src/gdb/maint.c:82: internal-error: foobar^M
A problem internal to GDB has been detectedFAIL: \
  gdb.base/bt-on-error-and-warning.exp: problem=internal-error, mode=on: \
  scan for backtrace (GDB internal error)
Resyncing due to internal error.
,^M
...

The corresponding gdb_test_multiple in the test-case contains:
...
           -early -re "^A problem internal to GDB has been detected,\r\n" {
               incr header_lines
               exp_continue
           }
...
but instead this one triggers in gdb_test_multiple:
...
        -re ".*A problem internal to GDB has been detected" {
            fail "$message (GDB internal error)"
            gdb_internal_error_resync
            set result -1
        }
...

Fix this by likewise shortening the regexp to before the comma.

Tested on x86_64-linux.
---

diff --git a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
index a43a951bbd2..5ec13112f3e 100644
--- a/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
+++ b/gdb/testsuite/gdb.base/bt-on-error-and-warning.exp
@@ -70,11 +70,11 @@ proc run_test {problem_type mode} {
 		incr header_lines
 		exp_continue
 	    }
-	    -early -re "^A problem internal to GDB has been detected,\r\n" {
+	    -early -re "^A problem internal to GDB has been detected" {
 		incr header_lines
 		exp_continue
 	    }
-	    -early -re "^further debugging may prove unreliable\\.\r\n" {
+	    -early -re "^,\r\nfurther debugging may prove unreliable\\.\r\n" {
 		incr header_lines
 		exp_continue
 	    }