2011-12-07 Pedro Alves <pedro@codesourcery.com>

	* gdb.ada/catch_ex.exp: Skip as unsupported if "catch exception"
	throws "Cannot insert catchpoints in this configuration".
	* gdb.ada/mi_catch_ex.exp: Likewise.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ca83855a32f7043af17d53133476c6abbe7b0fa3..2aee60ceb7d1ba8a1ee9333a4b323ccda5b7ab07 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-12-07  Pedro Alves  <pedro@codesourcery.com>
+
+       * gdb.ada/catch_ex.exp: Skip as unsupported if "catch exception"
+       throws "Cannot insert catchpoints in this configuration".
+       * gdb.ada/mi_catch_ex.exp: Likewise.
+
 2011-12-06  Pedro Alves  <pedro@codesourcery.com>
 
        * gdb.base/break-always.exp: Test changing memory at addresses

diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp
index fa458d86822439b8481958a994c08fcab5a40c02..0ea32568ebc74120fd1b06894b5970090ccee51e 100644 (file)
--- a/gdb/testsuite/gdb.ada/catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/catch_ex.exp
@@ -56,7 +56,7 @@ gdb_test_multiple "catch exception" $msg {
     -re "Catchpoint $any_nb: all Ada exceptions$eol$gdb_prompt $" {
        pass $msg
     }
-    -re "Cannot break on __gnat_raise_nodefer_with_msg in this configuration\.$eol$gdb_prompt $" {
+    -re "Cannot (insert catchpoints|break on __gnat_raise_nodefer_with_msg) in this configuration\.$eol$gdb_prompt $" {
        # If the runtime was not built with enough debug information,
        # or if it was stripped, we can not test exception
        # catchpoints.

diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index dadc5746e5b92d3213001c1a1608115301ed93fc..4be1cad98aae54a7df892a61ad6ab2c8f14473c3 100644 (file)
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -46,7 +46,7 @@ gdb_test_multiple "catch exception" $msg {
     -re "Catchpoint $any_nb: all Ada exceptions$eol$gdb_prompt $" {
        pass $msg
     }
-    -re "Cannot break on __gnat_raise_nodefer_with_msg in this configuration\.\[\r\n\]+$gdb_prompt $" {
+    -re "Cannot (insert catchpoints|break on __gnat_raise_nodefer_with_msg) in this configuration\.\[\r\n\]+$gdb_prompt $" {
        # If the runtime was not built with enough debug information,
        # or if it was stripped, we can not test exception
        # catchpoints.