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

	to the caller.
	(gdb_test_multiple): Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8b291cb1b14a1a2289c2006a582892fc79907383..80f744079d7a03617acf30c2d282bfb85cd1497e 100644 (file)
--- 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 611528586925e632950c4bc27987fdebb1161440..8ac32db793dcfe7e614c214c53fe64742c2a0039 100644 (file)
--- 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
     }
 }