From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23794 invoked by alias); 19 Jul 2006 10:20:18 -0000 Received: (qmail 23776 invoked by uid 22791); 19 Jul 2006 10:20:17 -0000 X-Spam-Check-By: sourceware.org Received: from lon-del-02.spheriq.net (HELO lon-del-02.spheriq.net) (195.46.50.98) by sourceware.org (qpsmtpd/0.31) with ESMTP; Wed, 19 Jul 2006 10:20:12 +0000 Received: from lon-out-01.spheriq.net ([195.46.50.129]) by lon-del-02.spheriq.net with ESMTP id k6JAJpfR011693 for ; Wed, 19 Jul 2006 10:19:51 GMT Received: from lon-cus-02.spheriq.net (lon-cus-02.spheriq.net [195.46.50.38]) by lon-out-01.spheriq.net with ESMTP id k6JAJnSF024791 for ; Wed, 19 Jul 2006 10:19:50 GMT Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by lon-cus-02.spheriq.net with ESMTP id k6JAJ3hY018490 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=OK) for ; Wed, 19 Jul 2006 10:19:13 GMT Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id CF707DB8F for ; Wed, 19 Jul 2006 09:55:16 +0000 (GMT) Received: from mail1.bri.st.com (mail1.bri.st.com [164.129.8.218]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 97AB2473D0 for ; Wed, 19 Jul 2006 09:55:16 +0000 (GMT) Received: from [164.129.15.13] (bri1043.bri.st.com [164.129.15.13]) by mail1.bri.st.com (MOS 3.5.8-GR) with ESMTP id CHV36819 (AUTH stubbsa); Wed, 19 Jul 2006 10:55:15 +0100 (BST) Message-ID: <44BE0182.1050703@st.com> Date: Wed, 19 Jul 2006 10:20:00 -0000 From: Andrew STUBBS User-Agent: Thunderbird 1.5.0.4 (Windows/20060516) MIME-Version: 1.0 To: GDB Patches Subject: [PATCH] Fix ifelse.exp Content-Type: multipart/mixed; boundary="------------060708000801000908050903" X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2006-07/txt/msg00253.txt.bz2 This is a multi-part message in MIME format. --------------060708000801000908050903 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 162 This patch ought to solve the recent problems with ifelse.exp. I have tested it with and without the problem it tests for. Sorry for the inconvenience. Andrew --------------060708000801000908050903 Content-Type: text/plain; name="ifelse-update.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="ifelse-update.patch" Content-length: 1877 2006-07-19 Andrew Stubbs * gdb.base/ifelse.exp: Remove troublesome 'got here' messages. Index: src/gdb/testsuite/gdb.base/ifelse.exp =================================================================== --- src.orig/gdb/testsuite/gdb.base/ifelse.exp 2006-07-07 13:50:15.000000000 +0100 +++ src/gdb/testsuite/gdb.base/ifelse.exp 2006-07-19 10:49:14.000000000 +0100 @@ -30,8 +30,8 @@ gdb_start # with true condition set message "if 1 with empty body" -gdb_test_multiple "if 1\nend\necho got here\\n" $message { - -re ".*got here.*$gdb_prompt $" {pass $message} +gdb_test_multiple "if 1\nend" $message { + -re "$gdb_prompt $" {pass $message} eof { fail "$message (crashed)" gdb_exit @@ -41,8 +41,8 @@ gdb_test_multiple "if 1\nend\necho got h # with false condition set message "if 0 with empty body" -gdb_test_multiple "if 0\nend\necho got here\\n" $message { - -re ".*got here.*$gdb_prompt $" {pass $message} +gdb_test_multiple "if 0\nend" $message { + -re "$gdb_prompt $" {pass $message} eof { fail "$message (crashed)" gdb_exit @@ -62,8 +62,8 @@ gdb_test "if 1\necho true\\n\nelse\necho # with true condition set message "if 1 .. else with empty body" -gdb_test_multiple "if 1\nelse\nend\necho got here\\n" $message { - -re ".*got here.*$gdb_prompt $" {pass $message} +gdb_test_multiple "if 1\nelse\nend" $message { + -re "$gdb_prompt $" {pass $message} eof { fail "$message (crashed)" gdb_exit @@ -76,8 +76,8 @@ gdb_test "if 1\necho true\\n\nelse\necho # with false condition set message "if 0 .. else with empty body" -gdb_test_multiple "if 0\nelse\nend\necho got here\\n" $message { - -re ".*got here.*$gdb_prompt $" {pass $message} +gdb_test_multiple "if 0\nelse\nend" $message { + -re "$gdb_prompt $" {pass $message} eof { fail "$message (crashed)" gdb_exit --------------060708000801000908050903--