From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-cvs-return-45580-listarch-gdb-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 36556 invoked by alias); 29 Jul 2019 09:24:51 -0000
Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-cvs.sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-cvs/>
List-Post: <mailto:gdb-cvs@sourceware.org>
List-Help: <mailto:gdb-cvs-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-cvs-owner@sourceware.org
List-Subscribe: <mailto:gdb-cvs-subscribe@sourceware.org>
Sender: gdb-cvs-owner@sourceware.org
Received: (qmail 36538 invoked by uid 9882); 29 Jul 2019 09:24:51 -0000
Date: Mon, 29 Jul 2019 09:24:00 -0000
Message-ID: <20190729092451.36537.qmail@sourceware.org>
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: Tom de Vries <vries@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] [gdb/testsuite] Fix gdb.base/define.exp with
 check-read1
X-Act-Checkin: binutils-gdb
X-Git-Author: Tom de Vries <tdevries@suse.de>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: d17725d72f25812acc8bd16a368c0e889c4b4d1e
X-Git-Newrev: b528dae0954436ab103fb8ab6fc1ca632b4a7c51
X-SW-Source: 2019-07/txt/msg00195.txt.bz2

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=b528dae0954436ab103fb8ab6fc1ca632b4a7c51

commit b528dae0954436ab103fb8ab6fc1ca632b4a7c51
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Jul 29 11:24:04 2019 +0200

    [gdb/testsuite] Fix gdb.base/define.exp with check-read1
    
    When running gdb.base/define.exp with check-read1, we get:
    ...
    show prompt^M
    Gdb's prompt is "(gdb) ".^M
    (gdb) PASS: gdb.base/define.exp: save gdb_prompt
    set prompt \(blah\) ^M
    (blah) PASS: gdb.base/define.exp: set gdb_prompt
    set prompt (gdb) PASS: gdb.base/define.exp: reset gdb_prompt
    ^M
    (gdb) FAIL: gdb.base/define.exp: define do-define
    ...
    
    The problem is that the "$gdb_prompt $" regexp here:
    ...
    gdb_test_multiple "set prompt $prior_prompt " "reset gdb_prompt" {
        -re "$gdb_prompt $" {
            pass "reset gdb_prompt"
        }
    }
    ...
    triggers for the echoing of the command "set prompt $prior_prompt " rather
    than for the prompt after the command has executed.
    
    Fix this by changing the regexp to "\r\n$gdb_prompt $".
    
    Tested on x86_64-linux.
    
    gdb/testsuite/ChangeLog:
    
    2019-07-29  Tom de Vries  <tdevries@suse.de>
    
    	* gdb.base/define.exp: Add "\r\n" to "reset gdb_prompt" regexp.

Diff:
---
 gdb/testsuite/ChangeLog           | 4 ++++
 gdb/testsuite/gdb.base/define.exp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f79dc9f..ff6159e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2019-07-29  Tom de Vries  <tdevries@suse.de>
 
+	* gdb.base/define.exp: Add "\r\n" to "reset gdb_prompt" regexp.
+
+2019-07-29  Tom de Vries  <tdevries@suse.de>
+
 	PR gdb/24855
 	* lib/gdb.exp (gdb_test_multiple): Add prompt_regexp parameter.
 	(skip_python_tests_prompt): Add prompt_regexp argument to
diff --git a/gdb/testsuite/gdb.base/define.exp b/gdb/testsuite/gdb.base/define.exp
index e8508b8..d7d4fd0 100644
--- a/gdb/testsuite/gdb.base/define.exp
+++ b/gdb/testsuite/gdb.base/define.exp
@@ -302,7 +302,7 @@ gdb_test_multiple "set prompt \\(blah\\) " "set gdb_prompt" {
 }
 
 gdb_test_multiple "set prompt $prior_prompt " "reset gdb_prompt" {
-    -re "$gdb_prompt $" {
+    -re "\r\n$gdb_prompt $" {
 	pass "reset gdb_prompt"
     }
 }