aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/remote.exp6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f333916..3f93c17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03 Maciej W. Rozycki <macro@codesourcery.com>
+
+ * lib/remote.exp (remote_expect): Pass all exception conditions up
+ to the caller.
+
2011-03-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* lib/dg.exp (dg-test): Support nested calls.
diff --git a/lib/remote.exp b/lib/remote.exp
index abe8b20..8a26518 100644
--- a/lib/remote.exp
+++ b/lib/remote.exp
@@ -1256,11 +1256,7 @@ proc remote_expect { board timeout args } {
if {$code == 1} {
return -code error -errorinfo $errorInfo -errorcode $errorCode $string
- } elseif {$code == 2} {
- return -code return $string
- } elseif {$code == 3} {
- return
- } elseif {$code > 4} {
+ } else {
return -code $code $string
}
}