* lib/gdb.exp (gdb_expect): Pass all the exception conditions up

to the caller.
	(gdb_test_multiple): Likewise.
This commit is contained in:
Maciej W. Rozycki
2011-12-02 23:58:01 +00:00
parent a07f218d86
commit d6d7a51a33
2 changed files with 8 additions and 10 deletions

View File

@ -1,3 +1,9 @@
2011-12-02 Maciej W. Rozycki <macro@codesourcery.com>
* lib/gdb.exp (gdb_expect): Pass all the exception conditions up
to the caller.
(gdb_test_multiple): Likewise.
2011-12-02 Jan Kratochvil <jan.kratochvil@redhat.com> 2011-12-02 Jan Kratochvil <jan.kratochvil@redhat.com>
Fix gdb.mi/mi-solib.exp without system debug info installed. Fix gdb.mi/mi-solib.exp without system debug info installed.

View File

@ -844,11 +844,7 @@ proc gdb_test_multiple { command message user_code } {
if {$code == 1} { if {$code == 1} {
global errorInfo errorCode; global errorInfo errorCode;
return -code error -errorinfo $errorInfo -errorcode $errorCode $string return -code error -errorinfo $errorInfo -errorcode $errorCode $string
} elseif {$code == 2} { } elseif {$code > 1} {
return -code return $string
} elseif {$code == 3} {
return
} elseif {$code > 4} {
return -code $code $string return -code $code $string
} }
return $result return $result
@ -2640,11 +2636,7 @@ proc gdb_expect { args } {
global errorInfo errorCode; global errorInfo errorCode;
return -code error -errorinfo $errorInfo -errorcode $errorCode $string return -code error -errorinfo $errorInfo -errorcode $errorCode $string
} elseif {$code == 2} { } else {
return -code return $string
} elseif {$code == 3} {
return
} elseif {$code > 4} {
return -code $code $string return -code $code $string
} }
} }