diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 14 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/info_exc.exp | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/info_exc/const.ads | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/info_exc/foo.adb | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/mi_exc_info.exp | 10 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/mi_exc_info/const.ads | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.ada/mi_exc_info/foo.adb | 2 |
7 files changed, 28 insertions, 14 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index e592cec..3aa68e3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,17 @@ +2013-11-16 Joel Brobecker <brobecker@adacore.com> + + * info_exc/const.ads (Aint_Global_GDB_E): Renames Aint_Global_E. + * info_exc/foo.adb: Adjust to new exception name. + * info_exc.exp: Adjust after exception renaming in const.ads. + Update "info exception global" test to test "info exceptions + global_gdb" instead. + + * mi_exc_info/const.ads (Aint_Global_GDB_E): Renames Aint_Global_E. + * mi_exc_info/foo.adb (Adjust to new exception name. + * mi_exc_info.exp: Adjust after exception renaming in const.ads. + Update "-info-ada-exceptions global" test to test + "-info-ada-exceptions global_gdb" instead. + 2013-11-15 Luis Machado <lgustavo@codesourcery.com> * lib/mi-support.exp (mi_gdb_test): Expect different formats diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp index 9210029..087ae32 100644 --- a/gdb/testsuite/gdb.ada/info_exc.exp +++ b/gdb/testsuite/gdb.ada/info_exc.exp @@ -46,19 +46,19 @@ gdb_test "info exceptions" \ "storage_error: $hex" \ "tasking_error: $hex" \ ".*" \ - "const.aint_global_e: $hex" \ + "const.aint_global_gdb_e: $hex" \ ".*"] gdb_test "info exceptions task" \ [multi_line "All Ada exceptions matching regular expression \"task\":" \ "tasking_error: $hex"] -gdb_test "info exceptions global" \ - [multi_line "All Ada exceptions matching regular expression \"global\":" \ - "const.aint_global_e: $hex"] +gdb_test "info exceptions global_gdb" \ + [multi_line "All Ada exceptions matching regular expression \"global_gdb\":" \ + "const.aint_global_gdb_e: $hex"] gdb_test "info exceptions const.aint" \ [multi_line "All Ada exceptions matching regular expression \"const\\.aint\":" \ "constraint_error: $hex" \ - "const.aint_global_e: $hex"] + "const.aint_global_gdb_e: $hex"] diff --git a/gdb/testsuite/gdb.ada/info_exc/const.ads b/gdb/testsuite/gdb.ada/info_exc/const.ads index 753241e..20a8424 100644 --- a/gdb/testsuite/gdb.ada/info_exc/const.ads +++ b/gdb/testsuite/gdb.ada/info_exc/const.ads @@ -14,5 +14,5 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. package Const is - Aint_Global_E : exception; + Aint_Global_GDB_E : exception; end Const; diff --git a/gdb/testsuite/gdb.ada/info_exc/foo.adb b/gdb/testsuite/gdb.ada/info_exc/foo.adb index e047db2..f00a09e 100644 --- a/gdb/testsuite/gdb.ada/info_exc/foo.adb +++ b/gdb/testsuite/gdb.ada/info_exc/foo.adb @@ -16,5 +16,5 @@ with Const; use Const; procedure Foo is begin - raise Aint_Global_E; + raise Aint_Global_GDB_E; end Foo; diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp index 14a9e4d..6ca2328 100644 --- a/gdb/testsuite/gdb.ada/mi_exc_info.exp +++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp @@ -39,18 +39,18 @@ mi_gdb_reinitialize_dir $srcdir/$subdir mi_gdb_load ${binfile} mi_gdb_test "-info-ada-exceptions" \ - "\\^done,ada-exceptions={nr_rows=\"$decimal\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},.*{name=\"const.aint_global_e\",address=\"$hex\"}.*\\\]}" \ + "\\^done,ada-exceptions={nr_rows=\"$decimal\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"program_error\",address=\"$hex\"},{name=\"storage_error\",address=\"$hex\"},{name=\"tasking_error\",address=\"$hex\"},.*{name=\"const.aint_global_gdb_e\",address=\"$hex\"}.*\\\]}" \ "-info-ada-exceptions" mi_gdb_test "-info-ada-exceptions task" \ "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"tasking_error\",address=\"$hex\"}\\\]}" \ "-info-ada-exceptions task" -mi_gdb_test "-info-ada-exceptions global" \ - "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \ - "-info-ada-exceptions global" +mi_gdb_test "-info-ada-exceptions global_gdb" \ + "\\^done,ada-exceptions={nr_rows=\"1\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \ + "-info-ada-exceptions global_gdb" mi_gdb_test "-info-ada-exceptions const.aint" \ - "\\^done,ada-exceptions={nr_rows=\"2\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"const.aint_global_e\",address=\"$hex\"}\\\]}" \ + "\\^done,ada-exceptions={nr_rows=\"2\",nr_cols=\"2\",hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"name\",colhdr=\"Name\"},{width=\"1\",alignment=\"-1\",col_name=\"address\",colhdr=\"Address\"}\\\],body=\\\[{name=\"constraint_error\",address=\"$hex\"},{name=\"const.aint_global_gdb_e\",address=\"$hex\"}\\\]}" \ "-info-ada-exceptions const.aint" diff --git a/gdb/testsuite/gdb.ada/mi_exc_info/const.ads b/gdb/testsuite/gdb.ada/mi_exc_info/const.ads index 753241e..20a8424 100644 --- a/gdb/testsuite/gdb.ada/mi_exc_info/const.ads +++ b/gdb/testsuite/gdb.ada/mi_exc_info/const.ads @@ -14,5 +14,5 @@ -- along with this program. If not, see <http://www.gnu.org/licenses/>. package Const is - Aint_Global_E : exception; + Aint_Global_GDB_E : exception; end Const; diff --git a/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb b/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb index e047db2..f00a09e 100644 --- a/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb +++ b/gdb/testsuite/gdb.ada/mi_exc_info/foo.adb @@ -16,5 +16,5 @@ with Const; use Const; procedure Foo is begin - raise Aint_Global_E; + raise Aint_Global_GDB_E; end Foo; |