| Index: gdb/testsuite/gdb.ada/info_exc.exp
 | 
| diff --git a/gdb/testsuite/gdb.ada/sym_print_name.exp b/gdb/testsuite/gdb.ada/info_exc.exp
 | 
| similarity index 54%
 | 
| copy from gdb/testsuite/gdb.ada/sym_print_name.exp
 | 
| copy to gdb/testsuite/gdb.ada/info_exc.exp
 | 
| index 7a8765a7b7d492eda20bce3447ca2b5d088e4046..087ae320ad0750699372107eaacabf6aa7953ff2 100644
 | 
| --- a/gdb/testsuite/gdb.ada/sym_print_name.exp
 | 
| +++ b/gdb/testsuite/gdb.ada/info_exc.exp
 | 
| @@ -1,4 +1,4 @@
 | 
| -# Copyright 2008-2012 Free Software Foundation, Inc.
 | 
| +# Copyright 2013 Free Software Foundation, Inc.
 | 
|  #
 | 
|  # This program is free software; you can redistribute it and/or modify
 | 
|  # it under the terms of the GNU General Public License as published by
 | 
| @@ -15,12 +15,8 @@
 | 
|  
 | 
|  load_lib "ada.exp"
 | 
|  
 | 
| -set testdir "sym_print_name"
 | 
| -set testfile "${testdir}/foo"
 | 
| -set srcfile ${srcdir}/${subdir}/${testfile}.adb
 | 
| -set binfile ${objdir}/${subdir}/${testfile}
 | 
| +standard_ada_testfile foo
 | 
|  
 | 
| -file mkdir ${objdir}/${subdir}/${testdir}
 | 
|  if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } {
 | 
|    return -1
 | 
|  }
 | 
| @@ -38,29 +34,31 @@ proc multi_line { args } {
 | 
|  
 | 
|  clean_restart ${testfile}
 | 
|  
 | 
| -set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb]
 | 
| -runto "foo.adb:$bp_location"
 | 
| +if ![runto_main] then {
 | 
| +   fail "Cannot run to main, testcase aborted"
 | 
| +   return 0
 | 
| +}
 | 
|  
 | 
| -set menu [multi_line "Multiple matches for integervar" \
 | 
| -                     "\\\[0\\\] cancel" \
 | 
| -                     "\\\[1\\\] pck\\.first\\.integervar.*" \
 | 
| -                     "\\\[2\\\] pck\\.second\\.integervar.*" \
 | 
| -                     "> $" ]
 | 
| +gdb_test "info exceptions" \
 | 
| +    [multi_line "All defined Ada exceptions:" \
 | 
| +                "constraint_error: $hex" \
 | 
| +                "program_error: $hex" \
 | 
| +                "storage_error: $hex" \
 | 
| +                "tasking_error: $hex" \
 | 
| +                ".*" \
 | 
| +                "const.aint_global_gdb_e: $hex" \
 | 
| +                ".*"]
 | 
|  
 | 
| -set test_name "multiple matches for symbol integervar"
 | 
| -gdb_test_multiple "print integervar" "$test_name" \
 | 
| -{
 | 
| -      -re "$menu" {
 | 
| -          pass "$test_name"
 | 
| -      }
 | 
| +gdb_test "info exceptions task" \
 | 
| +    [multi_line "All Ada exceptions matching regular expression \"task\":" \
 | 
| +                "tasking_error: $hex"]
 | 
|  
 | 
| -      default {
 | 
| -          fail "$test_name"
 | 
| -      }
 | 
| -}
 | 
| +gdb_test "info exceptions global_gdb" \
 | 
| +    [multi_line "All Ada exceptions matching regular expression \"global_gdb\":" \
 | 
| +                "const.aint_global_gdb_e: $hex"]
 | 
|  
 | 
| -# Select the first choice from the multiple-choice menu above.
 | 
| -gdb_test "1" \
 | 
| -         "= 48" \
 | 
| -         "select first choice from multiple-choice menu"
 | 
| +gdb_test "info exceptions const.aint" \
 | 
| +    [multi_line "All Ada exceptions matching regular expression \"const\\.aint\":" \
 | 
| +                "constraint_error: $hex" \
 | 
| +                "const.aint_global_gdb_e: $hex"]
 | 
|  
 | 
| 
 |