From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-35696-listarch-gdb-patches=sources.redhat.com@sources.redhat.com>
Received: (qmail 31006 invoked by alias); 8 Sep 2004 23:24:45 -0000
Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:gdb-patches-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sources.redhat.com>
List-Help: <mailto:gdb-patches-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: gdb-patches-owner@sources.redhat.com
Received: (qmail 30994 invoked from network); 8 Sep 2004 23:24:43 -0000
Received: from unknown (HELO mx1.redhat.com) (66.187.233.31)
  by sourceware.org with SMTP; 8 Sep 2004 23:24:43 -0000
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i88NOhS0007091
	for <gdb-patches@sources.redhat.com>; Wed, 8 Sep 2004 19:24:43 -0400
Received: from zenia.home.redhat.com (porkchop.devel.redhat.com [172.16.58.2])
	by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i88NOV305625;
	Wed, 8 Sep 2004 19:24:32 -0400
To: gdb-patches@sources.redhat.com
Subject: RFA: adapt gdb/testsuite/config/sim.exp to new gdb_file_cmd
From: Jim Blandy <jimb@redhat.com>
Date: Wed, 08 Sep 2004 23:24:00 -0000
Message-ID: <vt2y8jkuyz1.fsf@zenia.home>
User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-SW-Source: 2004-09/txt/msg00134.txt.bz2


Here's a caller of gdb_file_cmd that wasn't updated when the type of
its return value was changed.

Tested on i686-pc-linux-gnu x powerpc-eabispe sim.

2004-09-08  Jim Blandy  <jimb@redhat.com>

	* config/sim.exp (gdb_load): Adapt to expect and return new return
	values from gdb_file_command.

Index: gdb/testsuite/config/sim.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/config/sim.exp,v
retrieving revision 1.2
diff -c -p -r1.2 sim.exp
*** gdb/testsuite/config/sim.exp	8 Feb 2004 03:56:14 -0000	1.2
--- gdb/testsuite/config/sim.exp	8 Sep 2004 23:22:12 -0000
*************** proc gdb_target_sim { } {
*** 46,52 ****
  
  #
  # gdb_load -- load a file into the debugger.
- #             return a -1 if anything goes wrong.
  #
  proc gdb_load { arg } {
      global verbose
--- 46,51 ----
*************** proc gdb_load { arg } {
*** 56,62 ****
      global gdb_prompt
  
      if { $arg != "" } {
! 	if [gdb_file_cmd $arg] then { return -1 }
      }
  
      gdb_target_sim
--- 55,64 ----
      global gdb_prompt
  
      if { $arg != "" } {
!         set status [gdb_file_cmd $arg]
!         if { [lindex $status 0] != "" } then {
!             return $status
!         }
      }
  
      gdb_target_sim
*************** proc gdb_load { arg } {
*** 71,77 ****
  	    }
  	    set timeout 30
  	    verbose "Timeout is now $timeout seconds" 2
! 	    return 1
  	}
  	-re "$gdb_prompt $"     {
  	    if $verbose>1 then {
--- 73,79 ----
  	    }
  	    set timeout 30
  	    verbose "Timeout is now $timeout seconds" 2
! 	    return { "" }
  	}
  	-re "$gdb_prompt $"     {
  	    if $verbose>1 then {