aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--config/gdb-comm.exp90
-rw-r--r--config/gdb_stub.exp32
-rw-r--r--config/sid.exp2
-rw-r--r--config/sim.exp2
-rw-r--r--config/unix.exp4
6 files changed, 73 insertions, 65 deletions
diff --git a/ChangeLog b/ChangeLog
index e70aa62..e3023a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-11-25 Ben Elliston <bje@gnu.org>
+
+ * config/gdb-comm.exp: Clean up whitespace.
+ * config/gdb_stub.exp: Likewise.
+ * config/sid.exp: Likewise.
+ * config/sim.exp: Likewise.
+ * config/unix.exp: Likewise.
+
2018-11-23 Ben Elliston <bje@gnu.org>
* doc/dejagnu.texi (getdirs procedure): Improve documentation
diff --git a/config/gdb-comm.exp b/config/gdb-comm.exp
index b60ccca..5182847 100644
--- a/config/gdb-comm.exp
+++ b/config/gdb-comm.exp
@@ -73,51 +73,51 @@ proc gdb_comm_file_cmd { arg } {
}
remote_send host "file $arg\n"
remote_expect host 60 {
- -re "Reading symbols from.*done.*$gdb_prompt $" {
- verbose "\t\tLoaded $arg into the $GDB"
- return 0
- }
- -re "has no symbol-table.*$gdb_prompt $" {
- perror "$arg wasn't compiled with \"-g\""
- return -1
- }
- -re "A program is being debugged already.*Kill it.*y or n. $" {
- remote_send host "y\n"
+ -re "Reading symbols from.*done.*$gdb_prompt $" {
+ verbose "\t\tLoaded $arg into the $GDB"
+ return 0
+ }
+ -re "has no symbol-table.*$gdb_prompt $" {
+ perror "$arg wasn't compiled with \"-g\""
+ return -1
+ }
+ -re "A program is being debugged already.*Kill it.*y or n. $" {
+ remote_send host "y\n"
verbose "\t\tKilling previous program being debugged"
- exp_continue
- }
- -re "Load new symbol table from \".*\".*y or n.*$" {
- remote_send host "y\n"
- remote_expect host 60 {
- -re "Reading symbols from.*done.*$gdb_prompt $" {
- verbose "\t\tLoaded $arg with new symbol table into $GDB"
- return 0
- }
- timeout {
- perror "(timeout) Couldn't load $arg, other program already loaded."
- return -1
- }
- }
- }
- -re ".*No such file or directory.*$gdb_prompt $" {
- perror "($arg) No such file or directory\n"
- return -1
- }
- -re "$gdb_prompt $" {
- perror "couldn't load $arg into $GDB."
- return -1
- }
- timeout {
- perror "couldn't load $arg into $GDB (timed out)."
- return -1
- }
+ exp_continue
+ }
+ -re "Load new symbol table from \".*\".*y or n.*$" {
+ remote_send host "y\n"
+ remote_expect host 60 {
+ -re "Reading symbols from.*done.*$gdb_prompt $" {
+ verbose "\t\tLoaded $arg with new symbol table into $GDB"
+ return 0
+ }
+ timeout {
+ perror "(timeout) Couldn't load $arg, other program already loaded."
+ return -1
+ }
+ }
+ }
+ -re ".*No such file or directory.*$gdb_prompt $" {
+ perror "($arg) No such file or directory\n"
+ return -1
+ }
+ -re "$gdb_prompt $" {
+ perror "couldn't load $arg into $GDB."
+ return -1
+ }
+ timeout {
+ perror "couldn't load $arg into $GDB (timed out)."
+ return -1
+ }
eof {
- # This is an attempt to detect a core dump, but seems not to
- # work. Perhaps we need to match .* followed by eof, in which
- # expect does not seem to have a way to do that.
- perror "couldn't load $arg into $GDB (end of file)."
- return -1
- }
+ # This is an attempt to detect a core dump, but seems not to
+ # work. Perhaps we need to match .* followed by eof, in which
+ # expect does not seem to have a way to do that.
+ perror "couldn't load $arg into $GDB (end of file)."
+ return -1
+ }
}
return 0
}
@@ -264,7 +264,7 @@ proc gdb_comm_load { dest prog args } {
# Make sure the file we're supposed to load really exists.
if {![file exists $prog]} then {
perror "$prog does not exist."
- return [list "untested" ""]
+ return [list "untested" ""]
}
if { [is_remote host] || ![board_info host exists fileid] } {
@@ -405,7 +405,7 @@ proc gdb_comm_load { dest prog args } {
gdb_comm_add_breakpoint abort
set output ""
-
+
# Now start up the program and look for our magic breakpoints.
# And a whole lot of other magic stuff too.
diff --git a/config/gdb_stub.exp b/config/gdb_stub.exp
index e8d5b68..6c6c8a5 100644
--- a/config/gdb_stub.exp
+++ b/config/gdb_stub.exp
@@ -139,7 +139,7 @@ proc gdb_stub_startup { dest } {
}
if {[board_info $dest exists serial]} {
- set serial [board_info $dest serial]
+ set serial [board_info $dest serial]
} else {
set serial [board_info $dest netport]
}
@@ -397,7 +397,7 @@ proc gdb_stub_spawn { dest prog args } {
if { [remote_ld $dest $prog] != 1 } {
return [list "fail" "remote_ld failed"]
}
-
+
set result [gdb_stub_start $dest]
if { [lindex $result 0] != "pass" } {
remote_reboot target
@@ -433,19 +433,19 @@ proc gdb_stub_wait { dest timeout } {
gdb_stub_go_idle $dest
return [list 1 ""]
}
- -re " EXIT code 0.*$gdb_prompt $" {
- gdb_stub_go_idle $dest
- return [list 0 ""]
- }
- -re " EXIT code \[1-9]\[0-9]*.*$gdb_prompt $" {
- gdb_stub_go_idle $dest
- return [list 0 ""]
- }
- -re " EXIT code 4242.*$gdb_prompt $" {
- gdb_stub_go_idle $dest
- return [list 1 ""]
- }
- -re "Program received.*$gdb_prompt $" {
+ -re " EXIT code 0.*$gdb_prompt $" {
+ gdb_stub_go_idle $dest
+ return [list 0 ""]
+ }
+ -re " EXIT code \[1-9]\[0-9]*.*$gdb_prompt $" {
+ gdb_stub_go_idle $dest
+ return [list 0 ""]
+ }
+ -re " EXIT code 4242.*$gdb_prompt $" {
+ gdb_stub_go_idle $dest
+ return [list 1 ""]
+ }
+ -re "Program received.*$gdb_prompt $" {
gdb_stub_go_idle $dest
return [list 1 ""]
}
@@ -535,7 +535,7 @@ proc gdb_stub_ld { dest prog } {
remote_send host "y\n"
exp_continue
}
- -re "Load new symbol table.*y or n. $" {
+ -re "Load new symbol table.*y or n. $" {
remote_send host "y\n"
exp_continue
}
diff --git a/config/sid.exp b/config/sid.exp
index e148a6c..77f1827 100644
--- a/config/sid.exp
+++ b/config/sid.exp
@@ -41,7 +41,7 @@ proc set_host_info { entry value } {
set machine host
if {[info exists target_info($machine,name)]} {
- set machine $target_info($machine,name)
+ set machine $target_info($machine,name)
}
set board_info($machine,$entry) $value
}
diff --git a/config/sim.exp b/config/sim.exp
index 8973884..0108104 100644
--- a/config/sim.exp
+++ b/config/sim.exp
@@ -33,7 +33,7 @@ proc sim_spawn { dest cmdline args } {
if {[board_info $dest exists sim,options]} {
set simflags [board_info $dest sim,options]
} else {
- set simflags ""
+ set simflags ""
}
if {![is_remote host]} {
diff --git a/config/unix.exp b/config/unix.exp
index 05dc4fe..c349b30 100644
--- a/config/unix.exp
+++ b/config/unix.exp
@@ -68,9 +68,9 @@ proc unix_load { dest prog args } {
set command "$prog $parg"
}
- if {![info exists ld_library_path]} {
+ if {![info exists ld_library_path]} {
set ld_library_path ""
- }
+ }
set orig_ld_library_path "[getenv LD_LIBRARY_PATH]"
setenv LD_LIBRARY_PATH "$ld_library_path:$orig_ld_library_path"