aboutsummaryrefslogtreecommitdiff
path: root/config/udi.exp
diff options
context:
space:
mode:
Diffstat (limited to 'config/udi.exp')
-rw-r--r--config/udi.exp58
1 files changed, 29 insertions, 29 deletions
diff --git a/config/udi.exp b/config/udi.exp
index 4719d45..c7a7f07 100644
--- a/config/udi.exp
+++ b/config/udi.exp
@@ -30,18 +30,18 @@
#
proc udi_load { dest prog args } {
- set shell_prompt [board_info $dest shell_prompt];
- set output "";
+ set shell_prompt [board_info $dest shell_prompt]
+ set output ""
if ![file exists $prog] then {
perror "$prog does not exist."
verbose -log "$prog does not exist." 3
- return [list "untested" ""];
+ return [list "untested" ""]
}
# Load the program.
if ![board_info $dest exists fileid] then {
- remote_open $dest;
+ remote_open $dest
if ![board_info $dest exists fileid] then {
verbose -log "$prog not executed, couldn't connect to $dest." 3
return "untested"
@@ -50,50 +50,50 @@ proc udi_load { dest prog args } {
if { [remote_ld $dest $prog] == "" } {
verbose -log "$prog not executed, load failed." 3
- return [list "unresolved" ""];
+ return [list "unresolved" ""]
}
# Execute it.
set result -1
- set output "";
- set noappend 0;
+ set output ""
+ set noappend 0
verbose "Executing $prog." 2
remote_send $dest "g\n"
# FIXME: The value 300 below should be a parameter.
remote_expect $dest 300 {
-re "(.*)Process exited with 0x0\[^\r\n\]*\[\r\n\]" {
- append output $expect_out(1,string);
+ append output $expect_out(1,string)
verbose "$prog executed successfully" 2
- set noappend 1;
- set result 0;
- exp_continue;
+ set noappend 1
+ set result 0
+ exp_continue
}
-re "(.*)Halt instruction encountered" {
- append output $expect_out(1,string);
+ append output $expect_out(1,string)
verbose "$prog got a HALT instruction" 2
- set result 1;
- set noappend 1;
- exp_continue;
+ set result 1
+ set noappend 1
+ exp_continue
}
-re "(^|\[\r\n\])$shell_prompt" {
if { $result == -1 } {
- exp_continue;
+ exp_continue
}
}
-re "(^|\[\r\n\]+)g\[\r\n\]+" {
- exp_continue;
+ exp_continue
}
-re "\[\r\n\]+" {
if { ! $noappend } {
- append output $expect_out(buffer);
+ append output $expect_out(buffer)
if { [string length $output] < 512000 } {
- exp_continue;
+ exp_continue
} else {
- set result 1;
+ set result 1
}
} else {
- exp_continue;
+ exp_continue
}
}
timeout {
@@ -104,12 +104,12 @@ proc udi_load { dest prog args } {
# See what happened.
switch -- $result {
0 {
- set status [check_for_board_status output];
+ set status [check_for_board_status output]
if { $status < 0 } {
blammo
}
if { $status > 0 } {
- set result "fail";
+ set result "fail"
} else {
set result "pass"
}
@@ -125,7 +125,7 @@ proc udi_load { dest prog args } {
# Get nastier. We want to leave the system in a state
# ready to run the next testcase.
remote_send $dest "q\n"
- remote_close $dest;
+ remote_close $dest
set udi_shell_id [remote_open $dest]
if { $udi_shell_id < 0 } {
perror "Couldn't reset $dest."
@@ -142,7 +142,7 @@ proc udi_load { dest prog args } {
set result "unresolved"
}
}
- return [list $result $output];
+ return [list $result $output]
}
#
@@ -150,9 +150,9 @@ proc udi_load { dest prog args } {
#
proc udi_exit {} {
- remote_close target;
+ remote_close target
}
-set_board_info protocol "udi";
-set_board_info connect "mondfe";
-set_board_info shell_prompt "mondfe>";
+set_board_info protocol "udi"
+set_board_info connect "mondfe"
+set_board_info shell_prompt "mondfe>"