public inbox for gdb-patches@sourceware.org
 help / color / mirror / Atom feed
From: Simon Marchi <simon.marchi@ericsson.com>
To: Joel Brobecker <brobecker@adacore.com>
Cc: <gdb-patches@sourceware.org>, <simon.marchi@polymtl.ca>
Subject: Re: [PATCH 2/3] Fix Python help() test for Python 3
Date: Fri, 28 Nov 2014 15:57:00 -0000	[thread overview]
Message-ID: <54789B4D.2090204@ericsson.com> (raw)
In-Reply-To: <20141127084744.GF5042@adacore.com>

> I am OK with the patch as is, and verified with Python 2.3, 2.6,
> 2.7 and 3.4 that "Welcome to Python" is part of the output of
> the help() function. But since the purpose of the test is purely
> to verify that the help() function does not hang, just verifying
> that we have the prompt should achieve that goal, so I don't see
> a need to extend the the expected output to match the "Welcome [...]"
> message as well. I would personally just drop the "online" from
> the expected output. Just my 2 cents, either way is fine.
> 
> Thank you!

Sure, it's really not a life or death issue. Let's go with this then?

From 5deccafc1d5713d77fbc78c65711d6f6a6f87892 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@ericsson.com>
Date: Tue, 25 Nov 2014 22:56:12 -0500
Subject: [PATCH] Fix Python help() test for Python 3

The message displayed when using help() changed a bit with time, so this
adjusts the test accordingly.

gdb/testsuite/ChangeLog:

	* gdb.python/python.exp: Change expected reply to help().
---
 gdb/testsuite/gdb.python/python.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gdb/testsuite/gdb.python/python.exp b/gdb/testsuite/gdb.python/python.exp
index 787a294..dcbc35c 100644
--- a/gdb/testsuite/gdb.python/python.exp
+++ b/gdb/testsuite/gdb.python/python.exp
@@ -67,7 +67,7 @@ gdb_py_test_multiple "multi-line python command" \
 with_test_prefix "python interactive help" {
     set test "python; help(); end"
     gdb_test_multiple "python\nhelp()\nend" $test {
-	-re "online help utility.*help> $" {
+	-re ".*help utility.*help> $" {
 	    pass $test

 	    # The "quit" must be seen on the output.  A buggy GDB
-- 
2.1.3

  reply	other threads:[~2014-11-28 15:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-26  4:36 [PATCH 1/3] python extended prompt: Use os.getcwd() instead of os.getcwdu() Simon Marchi
2014-11-26  4:36 ` [PATCH 3/3] Fix prints in tests for Python 3 Simon Marchi
2014-11-27  8:40   ` Joel Brobecker
2014-11-28 16:40     ` Simon Marchi
2014-11-26  4:36 ` [PATCH 2/3] Fix Python help() test " Simon Marchi
2014-11-27  8:47   ` Joel Brobecker
2014-11-28 15:57     ` Simon Marchi [this message]
2014-11-29 11:42       ` Joel Brobecker
2014-12-01 13:08         ` Simon Marchi
2014-11-27  9:00 ` [PATCH 1/3] python extended prompt: Use os.getcwd() instead of os.getcwdu() Joel Brobecker
2014-11-28 15:49   ` Simon Marchi
2014-11-29 11:42     ` Joel Brobecker
2014-12-05 20:36       ` Simon Marchi
2014-12-15 16:41         ` Simon Marchi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54789B4D.2090204@ericsson.com \
    --to=simon.marchi@ericsson.com \
    --cc=brobecker@adacore.com \
    --cc=gdb-patches@sourceware.org \
    --cc=simon.marchi@polymtl.ca \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).