aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2013-10-11 13:49:36 +0000
committerJoel Brobecker <brobecker@gnat.com>2013-10-11 13:49:36 +0000
commit2a3be96627a1d9e61fb66ec11c131bc4346e9ae9 (patch)
tree2c066612ea75d4263460530b4e2dd28be81c1a0a /gdb
parent349774efe258cff6b365b72df07f6ce2eb76cbd6 (diff)
downloadgdb-2a3be96627a1d9e61fb66ec11c131bc4346e9ae9.zip
gdb-2a3be96627a1d9e61fb66ec11c131bc4346e9ae9.tar.gz
gdb-2a3be96627a1d9e61fb66ec11c131bc4346e9ae9.tar.bz2
Adjust gdb.ada/mi_catch_ex.exp to use GDB/MI catch commands...
... in place of the CLI "catch ..." commands. The latter were used because the GDB/MI equivalents were not available at the time. gdb/testsuite/ChangeLog: * gdb.ada/mi_catch_ex.exp: Adjusts all "catch ..." tests to use the appropriate GDB/MI command instead, and verify the test output.
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.ada/mi_catch_ex.exp16
2 files changed, 18 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9f45e83..45da6fd 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,11 @@
2013-10-11 Joel Brobecker <brobecker@adacore.com>
+ * gdb.ada/mi_catch_ex.exp: Adjusts all "catch ..." tests to
+ use the appropriate GDB/MI command instead, and verify
+ the test output.
+
+2013-10-11 Joel Brobecker <brobecker@adacore.com>
+
* gdb.base/source-nofile.gdb: New file.
* gdb.base/source.exp: Add two tests verifying the behavior when
the "source" command is given a non-existant filename.
diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
index d30d44b..f26fcdf 100644
--- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp
+++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp
@@ -74,7 +74,9 @@ if ![mi_run_to_main] then {
return 0
}
-mi_gdb_test "catch exception"
+mi_gdb_test "-catch-exception" \
+ "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",addr=\"$hex\",what=\"all Ada exceptions\",.*}" \
+ "catch all exceptions"
mi_execute_to "exec-continue" \
"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR" \
@@ -107,11 +109,17 @@ if ![mi_run_to_main] then {
return 0
}
-mi_gdb_test "catch exception Program_Error"
+mi_gdb_test "-catch-exception -e Program_Error" \
+ "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",addr=\"$hex\",what=\"`Program_Error' Ada exception\",.*}" \
+ "catch Program_Error"
-mi_gdb_test "catch assert"
+mi_gdb_test "-catch-assert" \
+ "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",addr=\"$hex\",what=\"failed Ada assertions\",.*}" \
+ "catch assert failures"
-mi_gdb_test "catch exception unhandled"
+mi_gdb_test "-catch-exception -u" \
+ "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",addr=\"$hex\",what=\"unhandled Ada exceptions\",.*}" \
+ "catch unhandled exceptions"
mi_execute_to "exec-continue" \
"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"PROGRAM_ERROR" \