RFA: Update sim-defs.exp to support the rawsid protocol

RFA: Update sim-defs.exp to support the rawsid protocol

[Nick Clifton]

Hi Guys,

  Please could I have approval to check in the following patch ?  It
  adds support for the "rawsid" protocol to the simulator's testsuite
  support code in a similar fashion to the recent patch to
  dejagnu/config/sim.exp.

Cheers
  Nick

sim/testsuite/ChangeLog
2004-10-13  Nick Clifton  <nickc@redhat.com>

	* lib/sim-defs.exp (sim_run): Add support for the "rawsid"
	protocol.

Index: sim-defs.exp
===================================================================
RCS file: /cvs/src/src/sim/testsuite/lib/sim-defs.exp,v
retrieving revision 1.7
diff -c -3 -p -r1.7 sim-defs.exp
*** sim-defs.exp	13 Sep 2004 20:54:03 -0000	1.7
--- sim-defs.exp	13 Oct 2004 10:40:37 -0000
*************** proc sim_run { prog sim_opts prog_opts r
*** 109,120 ****
  	set sim "env $testcase_env $sim"
      }
  
!     send_log "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts\n"
  
      if { "$redir" == "" } {
! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts"
      } else {
! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts $redir" writeonly
      }
      set result [remote_wait host $testcase_timeout]
  
--- 109,127 ----
  	set sim "env $testcase_env $sim"
      }
  
!     if { [board_info target sim,protocol] == "sid" } {
! 	set cmd ""
! 	set sim_opts "$sim_opts -e \"set cpu-loader file [list ${prog}]\""
!     } else {
! 	set cmd "$prog"
!     }
! 
!     send_log "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts\n"
  
      if { "$redir" == "" } {
! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts"
      } else {
! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts $redir" writeonly
      }
      set result [remote_wait host $testcase_timeout]
  

Re: RFA: Update sim-defs.exp to support the rawsid protocol

[Andrew Cagney]

Nick Clifton wrote:
> Hi Guys,
> 
>   Please could I have approval to check in the following patch ?  It
>   adds support for the "rawsid" protocol to the simulator's testsuite
>   support code in a similar fashion to the recent patch to
>   dejagnu/config/sim.exp.

Ok (you're a sim maintainer so if it works for you :-).

Andrew

> sim/testsuite/ChangeLog
> 2004-10-13  Nick Clifton  <nickc@redhat.com>
> 
> 	* lib/sim-defs.exp (sim_run): Add support for the "rawsid"
> 	protocol.
> 
> Index: sim-defs.exp
> ===================================================================
> RCS file: /cvs/src/src/sim/testsuite/lib/sim-defs.exp,v
> retrieving revision 1.7
> diff -c -3 -p -r1.7 sim-defs.exp
> *** sim-defs.exp	13 Sep 2004 20:54:03 -0000	1.7
> --- sim-defs.exp	13 Oct 2004 10:40:37 -0000
> *************** proc sim_run { prog sim_opts prog_opts r
> *** 109,120 ****
>   	set sim "env $testcase_env $sim"
>       }
>   
> !     send_log "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts\n"
>   
>       if { "$redir" == "" } {
> ! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts"
>       } else {
> ! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $prog $prog_opts $redir" writeonly
>       }
>       set result [remote_wait host $testcase_timeout]
>   
> --- 109,127 ----
>   	set sim "env $testcase_env $sim"
>       }
>   
> !     if { [board_info target sim,protocol] == "sid" } {
> ! 	set cmd ""
> ! 	set sim_opts "$sim_opts -e \"set cpu-loader file [list ${prog}]\""
> !     } else {
> ! 	set cmd "$prog"
> !     }
> ! 
> !     send_log "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts\n"
>   
>       if { "$redir" == "" } {
> ! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts"
>       } else {
> ! 	remote_spawn host "$sim $always_opts $SIMFLAGS $sim_opts $cmd $prog_opts $redir" writeonly
>       }
>       set result [remote_wait host $testcase_timeout]
>   
> 
> 

Re: RFA: Update sim-defs.exp to support the rawsid protocol

[Nick Clifton]

Hi Andrew,

> Ok (you're a sim maintainer so if it works for you :-).

Well, only for the ARM and this was actually for the xstormy16 port....

>> sim/testsuite/ChangeLog
>> 2004-10-13  Nick Clifton  <nickc@redhat.com>
>>
>>     * lib/sim-defs.exp (sim_run): Add support for the "rawsid"
>>     protocol.

Committed - thanks.

Cheers
   Nick