From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 3263 invoked by alias); 16 Dec 2002 18:04:46 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 3143 invoked from network); 16 Dec 2002 18:04:43 -0000 Received: from unknown (HELO touchme.toronto.redhat.com) (216.138.202.10) by sources.redhat.com with SMTP; 16 Dec 2002 18:04:43 -0000 Received: from redhat.com (toocool.toronto.redhat.com [172.16.14.72]) by touchme.toronto.redhat.com (Postfix) with ESMTP id 999FC800075; Mon, 16 Dec 2002 13:04:42 -0500 (EST) Message-ID: <3DFE15BA.4080207@redhat.com> Date: Mon, 16 Dec 2002 10:10:00 -0000 From: "J. Johnston" Organization: Red Hat Inc. User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.1) Gecko/20020823 Netscape/7.0 X-Accept-Language: en-us, en MIME-Version: 1.0 To: Daniel Jacobowitz Cc: gdb-patches@sources.redhat.com, ezannoni@redhat.com Subject: Re: Recent MI patches broke the testsuite References: <20021215211132.GA31984@nevyn.them.org> Content-Type: multipart/mixed; boundary="------------030304030804030106040205" X-SW-Source: 2002-12/txt/msg00487.txt.bz2 This is a multi-part message in MIME format. --------------030304030804030106040205 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-length: 2222 My bad. :( The new mi-basics.exp testcase is my usual sanity test for this change. It was updated and in fact works fine as it is expecting the new behavior. I did not look at the correct gdb.log for the full mi testsuite. As you have noted, the lib/mi-support.exp routine mi_reinitialize_dir is using -environment-directory and is expecting the old output. I have a patch for lib/mi=support.exp to handle the new syntax which I have included. Since I require approval for patches I will revert the original patch and resubmit with the added change unless Elena says otherwise. -- Jeff J. Daniel Jacobowitz wrote: > 202-environment-directory ../../../src/gdb/testsuite/gdb.mi > 202^done,source-path="/opt/src/binutils/x86-as/gdb/testsuite/../../../src/gdb/testsuite/gdb.mi:$cdir:$cwd" > (gdb) > FAIL: gdb.mi/mi-basics.exp: environment-directory arg operation > 203-environment-directory > 203^done,source-path="/opt/src/binutils/x86-as/gdb/testsuite/../../../src/gdb/testsuite/gdb.mi:$cdir:$cwd" > (gdb) > FAIL: gdb.mi/mi-basics.exp: environment-directory empty-string operation > > It appears to be this patch: > 2002-12-13 Jeff Johnston > > * mi-cmds.c (-environment-directory) Change to use mi_cmd_env_dir, > (-environment-cd): Change to use mi_cmd_env_cd,. > (-environment-pwd): Change to use mi_cmd_env_pwd. > (-environment-path): Change to use mi_cmd_env_path. > * mi-cmds.h (mi_cmd_env_cd, mi_cmd_env_dir): New prototypes. > (mi_cmd_env_path, mi_cmd_env_pwd): Ditto. > * mi-cmd-env.c: New file. Part of fix for PR gdb/741. > * gdbmi.texinfo (environment-cd): Update output and example. > (environment-pwd): Ditto. > (environment-dir): Update output, description, and examples. > (environment-path): Ditto. > > > Not only did it break several tests in gdb.mi/, it also broke the utility > function mi_gdb_reinitialize_dir in lib/mi-support.exp. This causes all my > testsuite runs to time out. Please don't commit patches like this without > testing them. > > The output which expects "105-^done\r\n" needs to be updated as well as the > tests in mi-basics.exp; possibly elsewhere. > --------------030304030804030106040205 Content-Type: text/plain; name="741.lib.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="741.lib.patch" Content-length: 1603 Index: lib/mi-support.exp =================================================================== RCS file: /cvs/src/src/gdb/testsuite/lib/mi-support.exp,v retrieving revision 1.19 diff -u -r1.19 mi-support.exp --- lib/mi-support.exp 25 Nov 2002 19:54:09 -0000 1.19 +++ lib/mi-support.exp 16 Dec 2002 17:49:08 -0000 @@ -234,6 +234,7 @@ proc mi_gdb_reinitialize_dir { subdir } { global mi_gdb_prompt + global MIFLAGS global suppress_flag if { $suppress_flag } { @@ -244,8 +245,9 @@ return ""; } - send_gdb "104-environment-directory\n" - gdb_expect 60 { + if { $MIFLAGS == "-i=mi1" } { + send_gdb "104-environment-directory\n" + gdb_expect 60 { -re ".*Reinitialize source path to empty.*y or n. " { warning "Got confirmation prompt for dir reinitialization." send_gdb "y\n" @@ -256,6 +258,14 @@ } -re "$mi_gdb_prompt$" {} timeout {error "Dir reinitialization failed (timeout)"} + } + } else { + send_gdb "104-environment-directory -r\n" + gdb_expect 60 { + -re "104\\\^done,source-path=.*\r\n$mi_gdb_prompt$" {} + -re "$mi_gdb_prompt$" {} + timeout {error "Dir reinitialization failed (timeout)"} + } } send_gdb "105-environment-directory $subdir\n" @@ -263,7 +273,7 @@ -re "Source directories searched.*$mi_gdb_prompt$" { verbose "Dir set to $subdir" } - -re "105\\\^done\r\n$mi_gdb_prompt$" { + -re "105\\\^done.*\r\n$mi_gdb_prompt$" { # FIXME: We return just the prompt for now. verbose "Dir set to $subdir" # perror "Dir \"$subdir\" failed." --------------030304030804030106040205--