diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 12 |
2 files changed, 8 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8b291cb..80f7440 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -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> Fix gdb.mi/mi-solib.exp without system debug info installed. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 6115285..8ac32db 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -844,11 +844,7 @@ proc gdb_test_multiple { command message user_code } { if {$code == 1} { global errorInfo errorCode; return -code error -errorinfo $errorInfo -errorcode $errorCode $string - } elseif {$code == 2} { - return -code return $string - } elseif {$code == 3} { - return - } elseif {$code > 4} { + } elseif {$code > 1} { return -code $code $string } return $result @@ -2640,11 +2636,7 @@ proc gdb_expect { args } { global errorInfo errorCode; 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 } } |