This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [PATCH 2/3] Fix Python help() test for Python 3


> 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


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]