| Index: gdb/testsuite/config/slite.exp
|
| diff --git a/gdb/testsuite/config/slite.exp b/gdb/testsuite/config/slite.exp
|
| index 52e547fa5b80ff7ac1c9f87fc07d7031e3bbe0e4..2270b81a26653d1dddf958e9936bb93754f72bf3 100644
|
| --- a/gdb/testsuite/config/slite.exp
|
| +++ b/gdb/testsuite/config/slite.exp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 1993, 1997-1998, 2007-2012 Free Software Foundation, Inc.
|
| +# Copyright 1993-2013 Free Software Foundation, Inc.
|
|
|
| # This program is free software; you can redistribute it and/or modify
|
| # it under the terms of the GNU General Public License as published by
|
| @@ -49,37 +49,37 @@ proc gdb_load { arg } {
|
| gdb_file_cmd $arg
|
|
|
| if [target_info exists gdb_protocol] {
|
| - set protocol [target_info gdb_protocol];
|
| + set protocol [target_info gdb_protocol]
|
| } else {
|
| set protocol "sparclite"
|
| }
|
|
|
| if [target_info exists serial] {
|
| - set targetname [target_info serial];
|
| - set command "target $protocol [target_info serial]\n";
|
| + set targetname [target_info serial]
|
| + set command "target $protocol [target_info serial]\n"
|
| } else {
|
| if ![target_info exists netport] {
|
| - perror "Need either netport or gdb_serial entry for [target_info name].";
|
| - return -1;
|
| + perror "Need either netport or gdb_serial entry for [target_info name]."
|
| + return -1
|
| }
|
| - set targetname [target_info netport];
|
| - set command "target $protocol udp [target_info netport]\n";
|
| + set targetname [target_info netport]
|
| + set command "target $protocol udp [target_info netport]\n"
|
| }
|
| set timeout 60
|
| verbose "Timeout is now $timeout seconds" 2
|
| - set try_count 0;
|
| - send_gdb $command;
|
| + set try_count 0
|
| + send_gdb $command
|
| gdb_expect {
|
| -re "Unknown response.*resetting the board.|remote timeout" {
|
| - incr try_count;
|
| + incr try_count
|
| if { $try_count > 3 } {
|
| - set try_count 0;
|
| - reboot_target;
|
| - sleep 5;
|
| + set try_count 0
|
| + reboot_target
|
| + sleep 5
|
| }
|
| - sleep 1;
|
| - send_gdb $command;
|
| - exp_continue;
|
| + sleep 1
|
| + send_gdb $command
|
| + exp_continue
|
| }
|
| -re "Remote target.*$gdb_prompt $" { }
|
| -re ".*SPARClite appears to be alive.*$gdb_prompt $" {
|
| @@ -96,16 +96,16 @@ proc gdb_load { arg } {
|
| }
|
|
|
| if [target_info exists gdb_load_offset] {
|
| - set offset "[target_info gdb_load_offset]";
|
| + set offset "[target_info gdb_load_offset]"
|
| } else {
|
| - set offset "";
|
| + set offset ""
|
| }
|
| if { 1 } {
|
| if [is_remote host] {
|
| - set arg [remote_download host $arg];
|
| + set arg [remote_download host $arg]
|
| if { $arg == "" } {
|
| error "download failed"
|
| - return -1;
|
| + return -1
|
| }
|
| }
|
| send_gdb "load $arg $offset\n"
|
| @@ -135,30 +135,30 @@ proc gdb_load { arg } {
|
| if [target_info exists need_monitor_run] {
|
| set timeout 10
|
| verbose "Timeout is now $timeout seconds, doing monitor run" 2
|
| - send_gdb "monitor run\n";
|
| - sleep 2;
|
| - send_gdb "";
|
| + send_gdb "monitor run\n"
|
| + sleep 2
|
| + send_gdb ""
|
| gdb_expect {
|
| -re ".*$gdb_prompt $" { verbose "Run command succeded" }
|
| default {
|
| - perror "error sending monitor run command";
|
| + perror "error sending monitor run command"
|
| }
|
| }
|
| } else {
|
| - sleep 2;
|
| + sleep 2
|
| }
|
|
|
| if [target_info exists gdb_serial] {
|
| - set serial [target_info gdb_serial];
|
| + set serial [target_info gdb_serial]
|
| } else {
|
| - set serial [target_info serial];
|
| + set serial [target_info serial]
|
| }
|
| send_gdb "target remote $serial\n"
|
| set timeout 60
|
| verbose "Timeout is now $timeout seconds" 2
|
| gdb_expect {
|
| -re ".*Kill it?.*y or n.*" {
|
| - send_gdb "y\n";
|
| + send_gdb "y\n"
|
| exp_continue
|
| }
|
| -re ".*$gdb_prompt $" {
|
|
|