From patchwork Fri Nov 28 15:57:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 3992 Received: (qmail 8809 invoked by alias); 28 Nov 2014 15:57:07 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8798 invoked by uid 89); 28 Nov 2014 15:57:06 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 28 Nov 2014 15:57:05 +0000 Received: from EUSAAHC007.ericsson.se (Unknown_Domain [147.117.188.93]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 8E.02.03307.98B48745; Fri, 28 Nov 2014 11:16:41 +0100 (CET) Received: from [142.133.110.254] (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.93) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 28 Nov 2014 10:57:02 -0500 Message-ID: <54789B4D.2090204@ericsson.com> Date: Fri, 28 Nov 2014 10:57:01 -0500 From: Simon Marchi User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Joel Brobecker CC: , Subject: Re: [PATCH 2/3] Fix Python help() test for Python 3 References: <1416976561-1927-1-git-send-email-simon.marchi@ericsson.com> <1416976561-1927-2-git-send-email-simon.marchi@ericsson.com> <20141127084744.GF5042@adacore.com> In-Reply-To: <20141127084744.GF5042@adacore.com> X-IsSubscribed: yes > 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 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