From: Tom Tromey Date: Tue, 16 Dec 2025 21:04:11 +0000 (-0700) Subject: Reindent gdb.ada tests X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6779faa9cea4e6abf7de8a79fb190b9c39d5e92e;p=thirdparty%2Fbinutils-gdb.git Reindent gdb.ada tests Various gdb.ada tests had incorrect indentation. This patch reformats these. It was written by script. --- diff --git a/gdb/testsuite/gdb.ada/O2_float_param.exp b/gdb/testsuite/gdb.ada/O2_float_param.exp index ac97af22b1c..c06fc2128e8 100644 --- a/gdb/testsuite/gdb.ada/O2_float_param.exp +++ b/gdb/testsuite/gdb.ada/O2_float_param.exp @@ -22,7 +22,7 @@ standard_ada_testfile foo set have_xfail 0 if {[is_aarch64_target]} { if { [gnat_version_compare < 9] } { - set have_xfail 1 + set have_xfail 1 } } @@ -47,18 +47,18 @@ foreach_gnat_encoding scenario flags {all minimal} { set re \ "#0.*callee\\.increment \\(val(=val@entry)?=99\\.0, msg=\\.\\.\\.\\).*" set re_different_entry_val \ - "#0\\s+callee\\.increment \\(val=99.0, val@entry=.*, msg=\\.\\.\\.\\).*" + "#0\\s+callee\\.increment \\(val=99.0, val@entry=.*, msg=\\.\\.\\.\\).*" gdb_test_multiple "frame" "" { - -re -wrap $re { - pass $gdb_test_name - } - -re -wrap $re_different_entry_val { - if { $have_xfail } { - # GCC PR98148 - xfail $gdb_test_name - } else { - fail $gdb_test_name - } - } + -re -wrap $re { + pass $gdb_test_name + } + -re -wrap $re_different_entry_val { + if { $have_xfail } { + # GCC PR98148 + xfail $gdb_test_name + } else { + fail $gdb_test_name + } + } } } diff --git a/gdb/testsuite/gdb.ada/access_tagged_param.exp b/gdb/testsuite/gdb.ada/access_tagged_param.exp index 337ca17aeaf..1e470f9e3c2 100644 --- a/gdb/testsuite/gdb.ada/access_tagged_param.exp +++ b/gdb/testsuite/gdb.ada/access_tagged_param.exp @@ -23,13 +23,13 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} if {![runto "foo"]} { - return + return } gdb_breakpoint "pck.adb:19" @@ -38,4 +38,4 @@ gdb_breakpoint "pck.adb:19" # the value of all the parameters. gdb_test "continue" \ - ".*Breakpoint $decimal, pck\\.inspect \\(obj=$hex, =\[1-9\]\\) at .*" + ".*Breakpoint $decimal, pck\\.inspect \\(obj=$hex, =\[1-9\]\\) at .*" diff --git a/gdb/testsuite/gdb.ada/access_to_packed_array.exp b/gdb/testsuite/gdb.ada/access_to_packed_array.exp index 1d4df5d4b03..bff580bc7d0 100644 --- a/gdb/testsuite/gdb.ada/access_to_packed_array.exp +++ b/gdb/testsuite/gdb.ada/access_to_packed_array.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/addr_arith.exp b/gdb/testsuite/gdb.ada/addr_arith.exp index d11161ece93..9f025b227e8 100644 --- a/gdb/testsuite/gdb.ada/addr_arith.exp +++ b/gdb/testsuite/gdb.ada/addr_arith.exp @@ -20,24 +20,24 @@ require allow_ada_tests standard_ada_testfile foo_na07_019 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo_na07_019.adb] if {![runto "foo_na07_019.adb:$bp_location"]} { - return + return } gdb_test "print something'address + 0" \ - "\\(system\\.address\\) $hex " + "\\(system\\.address\\) $hex " gdb_test "print 0 + something'address" \ - "\\(system\\.address\\) $hex " + "\\(system\\.address\\) $hex " gdb_test "print something'address - 0" \ - "\\(system\\.address\\) $hex " + "\\(system\\.address\\) $hex " gdb_test "print 0 - something'address" \ - "\\(system\\.address\\) $hex.*" + "\\(system\\.address\\) $hex.*" diff --git a/gdb/testsuite/gdb.ada/arr_arr.exp b/gdb/testsuite/gdb.ada/arr_arr.exp index 81e41f55611..f586c348026 100644 --- a/gdb/testsuite/gdb.ada/arr_arr.exp +++ b/gdb/testsuite/gdb.ada/arr_arr.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } # Accept "foo." prefix for older versions of GNAT. diff --git a/gdb/testsuite/gdb.ada/array_bounds.exp b/gdb/testsuite/gdb.ada/array_bounds.exp index 124d8668123..f9b4fb48cc3 100644 --- a/gdb/testsuite/gdb.ada/array_bounds.exp +++ b/gdb/testsuite/gdb.ada/array_bounds.exp @@ -20,24 +20,24 @@ require allow_ada_tests standard_ada_testfile bar if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/bar.adb] if {![runto "bar.adb:$bp_location"]} { - return + return } gdb_test "print itable'first" \ - "= 2" + "= 2" gdb_test "print itable'last" \ - "= 5" + "= 5" gdb_test "print table'first" \ - "= zero" + "= zero" gdb_test "print table'last" \ - "= two" + "= two" diff --git a/gdb/testsuite/gdb.ada/array_char_idx.exp b/gdb/testsuite/gdb.ada/array_char_idx.exp index 1989ee15baf..5101cd42003 100644 --- a/gdb/testsuite/gdb.ada/array_char_idx.exp +++ b/gdb/testsuite/gdb.ada/array_char_idx.exp @@ -26,12 +26,12 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { clean_restart ${testfile} gdb_test "ptype char_table" \ - "= array \\(character\\) of natural" + "= array \\(character\\) of natural" gdb_test "ptype global_char_table" \ - "= array \\(character\\) of natural" + "= array \\(character\\) of natural" # Some more recent versions of gcc can statically initialize this # array, so we allow either 0 or 4874. gdb_test "print my_table" "= \\((0|4874) \\)" \ - "Display my_table" + "Display my_table" diff --git a/gdb/testsuite/gdb.ada/array_return.exp b/gdb/testsuite/gdb.ada/array_return.exp index 206981b30e5..11cd1736c64 100644 --- a/gdb/testsuite/gdb.ada/array_return.exp +++ b/gdb/testsuite/gdb.ada/array_return.exp @@ -34,61 +34,61 @@ clean_restart ${testfile} # Start the inferior if {![runto_main]} { - return + return } # Create a breakpoint in each function from which we want to test # the "finish" command. gdb_test "break create_small" \ - "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ - "insert breakpoint in create_small" + "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ + "insert breakpoint in create_small" gdb_test "break create_large" \ - "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ - "insert breakpoint in create_large" + "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ + "insert breakpoint in create_large" gdb_test "break create_small_float_vector" \ - "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ - "insert breakpoint in create_small_float_vector" + "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." \ + "insert breakpoint in create_small_float_vector" # Then continue until reaching the first breakpoint inside Create_Small, # and then do a "finish". gdb_test "cont" \ - "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \ - "continuing to Create_Small" + "Breakpoint \[0-9\]+, pck.create_small \\(\\).*" \ + "continuing to Create_Small" gdb_test "finish" \ - "Value returned is \\\$\[0-9\]+ = \\(1, 1\\)" \ - "value printed by finish of Create_Small" + "Value returned is \\\$\[0-9\]+ = \\(1, 1\\)" \ + "value printed by finish of Create_Small" # Now continue until reaching the second breakpoint inside Create_Large, # and then do another "finish". gdb_test "cont" \ - "Breakpoint \[0-9\]+, pck.create_large \\(\\).*" \ - "continuing to Create_Large" + "Breakpoint \[0-9\]+, pck.create_large \\(\\).*" \ + "continuing to Create_Large" # On hppa32, the value returned is too large to be returned via a register. # Instead, it is returned using the struct convention, and the debugger # unfortunately cannot find the address of the result. The following # test is therefore expected to fail for all hppa targets except hppa64. if {![istarget "hppa*64*-*-*"]} { - setup_xfail "hppa*-*-*" + setup_xfail "hppa*-*-*" } gdb_test "finish" \ - "Value returned is \\\$\[0-9\]+ = \\(2, 2, 2, 2\\)" \ - "value printed by finish of Create_Large" + "Value returned is \\\$\[0-9\]+ = \\(2, 2, 2, 2\\)" \ + "value printed by finish of Create_Large" # Now continue until reaching the third breakpoint, and then do another # "finish" again. gdb_test "cont" \ - "Breakpoint \[0-9\]+, pck.create_small_float_vector \\(\\).*" \ - "continuing to Create_Small_Float_Vector" + "Breakpoint \[0-9\]+, pck.create_small_float_vector \\(\\).*" \ + "continuing to Create_Small_Float_Vector" gdb_test "finish" \ - "Value returned is \\\$\[0-9\]+ = \\(4.25, 4.25\\)" \ - "value printed by finish of Create_Small_Float_Vector" + "Value returned is \\\$\[0-9\]+ = \\(4.25, 4.25\\)" \ + "value printed by finish of Create_Small_Float_Vector" diff --git a/gdb/testsuite/gdb.ada/array_subscript_addr.exp b/gdb/testsuite/gdb.ada/array_subscript_addr.exp index 725de1ee1b6..23291b3c1cb 100644 --- a/gdb/testsuite/gdb.ada/array_subscript_addr.exp +++ b/gdb/testsuite/gdb.ada/array_subscript_addr.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -31,4 +31,4 @@ runto "p.adb:$bp_location" # Verify that we can compare a string slice with another string. gdb_test "print a(2)'Address" \ - "= \\(system\\.address\\) 0x\[0-9a-fA-F\]+" + "= \\(system\\.address\\) 0x\[0-9a-fA-F\]+" diff --git a/gdb/testsuite/gdb.ada/arraydim.exp b/gdb/testsuite/gdb.ada/arraydim.exp index 03096925dad..7b84a7af9b7 100644 --- a/gdb/testsuite/gdb.ada/arraydim.exp +++ b/gdb/testsuite/gdb.ada/arraydim.exp @@ -25,7 +25,7 @@ set cobject [standard_output_file ${cfile}.o] gdb_compile "${csrcfile}" "${cobject}" object [list debug] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-largs additional_flags=${cobject} additional_flags=-margs]] != "" } { - return + return } clean_restart ${testfile} @@ -34,7 +34,7 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "ptype m" \ - "array \\(1 \\.\\. 1, 2 \\.\\. 3, 4 \\.\\. 6\\) of integer" + "array \\(1 \\.\\. 1, 2 \\.\\. 3, 4 \\.\\. 6\\) of integer" gdb_test "print m'first" " = 1" gdb_test "print m'last" " = 1" @@ -53,7 +53,7 @@ gdb_test "print m'last(3)" " = 6" gdb_test "print m'length(3)" " = 3" gdb_test "ptype global_3dim_for_gdb_testing" \ - "array \\(0 \\.\\. 0, 0 \\.\\. 1, 0 \\.\\. 2\\) of int" + "array \\(0 \\.\\. 0, 0 \\.\\. 1, 0 \\.\\. 2\\) of int" gdb_test "print global_3dim_for_gdb_testing'first" " = 0" gdb_test "print global_3dim_for_gdb_testing'last" " = 0" diff --git a/gdb/testsuite/gdb.ada/arrayidx.exp b/gdb/testsuite/gdb.ada/arrayidx.exp index cebafe1c493..401b0062335 100644 --- a/gdb/testsuite/gdb.ada/arrayidx.exp +++ b/gdb/testsuite/gdb.ada/arrayidx.exp @@ -38,45 +38,45 @@ if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print one_two_three" \ - "= \\(1, 2, 3\\)" \ - "print one_two_three, indexes off" + "= \\(1, 2, 3\\)" \ + "print one_two_three, indexes off" gdb_test "print e_one_two_three" \ - "= \\(1, 2, 3\\)" \ - "print e_one_two_three, indexes off" + "= \\(1, 2, 3\\)" \ + "print e_one_two_three, indexes off" gdb_test "print r_two_three" \ - "= \\(two => 2, 3\\)" \ - "print r_two_three, indexes off" + "= \\(two => 2, 3\\)" \ + "print r_two_three, indexes off" gdb_test "print u_one_two_three" \ - "= \\(1, 2, 3\\)" \ - "print u_one_two_three, indexes off" + "= \\(1, 2, 3\\)" \ + "print u_one_two_three, indexes off" gdb_test "print p_one_two_three" \ - "= \\(false, true, true\\)" \ - "print p_one_two_three, indexes off" + "= \\(false, true, true\\)" \ + "print p_one_two_three, indexes off" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print few_reps" \ - "= \\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \ - "print few_reps, indexes off" + "= \\(1, 2, 3, 3, 3, 3, 3, 4, 5\\)" \ + "print few_reps, indexes off" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print many_reps" \ - "= \\(1, 2, 3 , 4, 5\\)" \ - "print many_reps, indexes off" + "= \\(1, 2, 3 , 4, 5\\)" \ + "print many_reps, indexes off" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print empty" \ - "= \\(\\)" \ - "print empty, indexes off" + "= \\(\\)" \ + "print empty, indexes off" # Next, print all the arrays with the indexes @@ -86,34 +86,34 @@ if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print one_two_three" \ - "= \\(1 => 1, 2 => 2, 3 => 3\\)" + "= \\(1 => 1, 2 => 2, 3 => 3\\)" gdb_test "print e_one_two_three" \ - "= \\(one => 1, two => 2, three => 3\\)" + "= \\(one => 1, two => 2, three => 3\\)" gdb_test "print r_two_three" \ - "= \\(two => 2, three => 3\\)" + "= \\(two => 2, three => 3\\)" gdb_test "print u_one_two_three" \ - "= \\(1 => 1, 2 => 2, 3 => 3\\)" + "= \\(1 => 1, 2 => 2, 3 => 3\\)" gdb_test "print p_one_two_three" \ - "= \\(one => false, two => true, three => true\\)" + "= \\(one => false, two => true, three => true\\)" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print few_reps" \ - "= \\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)" + "= \\(1 => 1, 2 => 2, 3 => 3, 4 => 3, 5 => 3, 6 => 3, 7 => 3, 8 => 4, 9 => 5\\)" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print many_reps" \ - "= \\(1 => 1, 2 => 2, 3 => 3 , 15 => 4, 16 => 5\\)" + "= \\(1 => 1, 2 => 2, 3 => 3 , 15 => 4, 16 => 5\\)" if {$old_gcc} { setup_xfail "*-*-*" } gdb_test "print empty" \ - "= \\(\\)" + "= \\(\\)" diff --git a/gdb/testsuite/gdb.ada/assign_1.exp b/gdb/testsuite/gdb.ada/assign_1.exp index ae2d622d21f..e4742688955 100644 --- a/gdb/testsuite/gdb.ada/assign_1.exp +++ b/gdb/testsuite/gdb.ada/assign_1.exp @@ -22,11 +22,11 @@ clean_restart # Force the language to Ada, as this will not happen automatically # in this case (no test program). gdb_test_no_output "set lang ada" \ - "changing the language to ada" + "changing the language to ada" gdb_test "print \$xxx := 1" \ - "= 1" \ - "set convenience variable \$xxx to 1" + "= 1" \ + "set convenience variable \$xxx to 1" gdb_test "print \$xxx := @ + 23 + @" \ diff --git a/gdb/testsuite/gdb.ada/assign_arr.exp b/gdb/testsuite/gdb.ada/assign_arr.exp index 7deff379a61..574ca1dba8a 100644 --- a/gdb/testsuite/gdb.ada/assign_arr.exp +++ b/gdb/testsuite/gdb.ada/assign_arr.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile main_p324_051 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -29,10 +29,10 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/main_p324_051.adb] runto "main_p324_051.adb:$bp_location" gdb_test "print assign_arr_input.u2 :=(0.25,0.5,0.75)" \ - " = \\(0\\.25, 0\\.5, 0\\.75\\)" + " = \\(0\\.25, 0\\.5, 0\\.75\\)" gdb_test "print assign_arr_input.u2 :=(0.25, others => 0.125)" \ - " = \\(0\\.25, 0\\.125, 0\\.125\\)" + " = \\(0\\.25, 0\\.125, 0\\.125\\)" set line [gdb_get_line_number "STOP2" ${testdir}/target_wrapper.adb] gdb_breakpoint target_wrapper.adb:$line diff --git a/gdb/testsuite/gdb.ada/assoc.exp b/gdb/testsuite/gdb.ada/assoc.exp index 63da1d55747..13722d15ee5 100644 --- a/gdb/testsuite/gdb.ada/assoc.exp +++ b/gdb/testsuite/gdb.ada/assoc.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile main if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/atomic_enum.exp b/gdb/testsuite/gdb.ada/atomic_enum.exp index 497a110ed10..4d35f609da6 100644 --- a/gdb/testsuite/gdb.ada/atomic_enum.exp +++ b/gdb/testsuite/gdb.ada/atomic_enum.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} @@ -29,9 +29,9 @@ set test "ptype pck.data_flag" gdb_test_multiple "$test" $test { -re "type = \\(one, two, three\\).*$gdb_prompt $" { pass $test - } + } -re "type = \\(\\).*$gdb_prompt $" { # This is a known compiler problem with Stabs. xfail $test - } + } } diff --git a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp index 4cabffa4c29..e7d1391f0e1 100644 --- a/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp +++ b/gdb/testsuite/gdb.ada/attr_ref_and_charlit.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile "foo" if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -39,7 +39,7 @@ with_test_prefix "run" { } gdb_test "continue" \ - ".*Breakpoint \[0-9\]+, foo\\.p \\(s=.*\\) at .*foo.adb:\[0-9\]+.*" + ".*Breakpoint \[0-9\]+, foo\\.p \\(s=.*\\) at .*foo.adb:\[0-9\]+.*" with_test_prefix "cont" { gdb_test "print s'first" " = 4" diff --git a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp index 5cf68f1ef22..ba55d904016 100644 --- a/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp +++ b/gdb/testsuite/gdb.ada/bad-task-bp-keyword.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -34,17 +34,17 @@ runto "foo.adb:$bp_location" # report an error. Try various weird combinations too. gdb_test "break *break_me'address TASK 2" \ - "Garbage 'TASK 2' at end of command" + "Garbage 'TASK 2' at end of command" set test "break *break_me'address TASK Task TaSK 2" gdb_test_multiple "$test" $test { -re "Garbage 'TASK Task TaSK 2' at end of command\[\r\n\]+$gdb_prompt $" { pass $test - } + } -re "Garbage 'TaSK 2' at end of command\[\r\n\]+$gdb_prompt $" { kfail gdb/14111 "$test" - } + } } gdb_test "break *break_me'address TASK if" \ - "Garbage 'TASK if' at end of command" + "Garbage 'TASK if' at end of command" diff --git a/gdb/testsuite/gdb.ada/big_packed_array.exp b/gdb/testsuite/gdb.ada/big_packed_array.exp index 24fec8cfee0..c8475f28d0a 100644 --- a/gdb/testsuite/gdb.ada/big_packed_array.exp +++ b/gdb/testsuite/gdb.ada/big_packed_array.exp @@ -44,29 +44,29 @@ foreach_gnat_encoding scenario flags {all minimal} { set re_xfail "= \\(0 => 0 \\)" set re_xfail2 "= \\(0 => 0 , ($decimal)\\)" gdb_test_multiple "print bad" "" { - -re -wrap $re { - pass $gdb_test_name - } - -re -wrap $re_xfail { - if { $have_xfail } { - # gcc/101643 - setup_xfail *-*-* - } - fail $gdb_test_name - } - -re -wrap $re_xfail2 { - set last $expect_out(1,string) - if { $endian == "little" } { - set mask 0x0f - } else { - set mask 0xf0 - } - if { $have_xfail && [string is integer $last] \ - && [expr ($last & $mask) == 0] } { - # gcc/101643 - setup_xfail *-*-* - } - fail $gdb_test_name - } + -re -wrap $re { + pass $gdb_test_name + } + -re -wrap $re_xfail { + if { $have_xfail } { + # gcc/101643 + setup_xfail *-*-* + } + fail $gdb_test_name + } + -re -wrap $re_xfail2 { + set last $expect_out(1,string) + if { $endian == "little" } { + set mask 0x0f + } else { + set mask 0xf0 + } + if { $have_xfail && [string is integer $last] \ + && [expr ($last & $mask) == 0] } { + # gcc/101643 + setup_xfail *-*-* + } + fail $gdb_test_name + } } } diff --git a/gdb/testsuite/gdb.ada/boolean_expr.exp b/gdb/testsuite/gdb.ada/boolean_expr.exp index 20d951cd5b1..64925631c5b 100644 --- a/gdb/testsuite/gdb.ada/boolean_expr.exp +++ b/gdb/testsuite/gdb.ada/boolean_expr.exp @@ -25,10 +25,10 @@ set any_addr "0x\[0-9a-zA-Z\]+" # Force the language to Ada, as this will not happen automatically # in this case (no test program). gdb_test_no_output "set lang ada" \ - "changing the language to ada" + "changing the language to ada" gdb_test "print 1 = 2" \ - "= false" + "= false" gdb_test "print 3 = 3" \ - "= true" + "= true" diff --git a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp index 8c4a524e79b..4dd4106649a 100644 --- a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp +++ b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp @@ -41,65 +41,65 @@ set options [list debug \ additional_flags=${cobject2} \ additional_flags=-margs] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $options] != "" } { - return + return } clean_restart ${testfile} if {![runto "foo_h731_021"]} { - return + return } # Verify that the current language is Ada. gdb_test "show lang" \ - "\"auto; currently ada\"\\." + "\"auto; currently ada\"\\." # Before running to the C function (and thus switching out of Ada # mode), try printing the function using the "<...>" notation. gdb_test "p " \ - " = void" \ - "p , in Ada" + " = void" \ + "p , in Ada" gdb_test "p " \ - " = {} $hex " \ - "p , in Ada" + " = {} $hex " \ + "p , in Ada" # Try inserting a breakpoint inside a C function. Because the function's # name has some uppercase letters, we need to use the "<...>" notation. # The purpose of this testcase is to verify that we can in fact do so # and that it inserts the breakpoint at the expected location. gdb_test "break " \ - "Breakpoint $decimal at $hex: file .*bar.c, line $decimal\\." + "Breakpoint $decimal at $hex: file .*bar.c, line $decimal\\." # Same, but this time on the function with no debug info. gdb_test "break " \ - "Breakpoint $decimal at $hex" + "Breakpoint $decimal at $hex" # Resume the program's execution, verifying that it lands at the expected # location. gdb_test "continue" \ - "Breakpoint $decimal, MixedCaseFunc \\(\\) at .*bar\\.c:$decimal.*" + "Breakpoint $decimal, MixedCaseFunc \\(\\) at .*bar\\.c:$decimal.*" # Try printing again using the "<...>" notation. This shouldn't work # now, since the current frame is a C function. gdb_test "p " \ - "A syntax error in expression, near `'\\." \ - "p , in C" + "A syntax error in expression, near `'\\." \ + "p , in C" gdb_test "p " \ - "A syntax error in expression, near `'\\." \ - "p , in C" + "A syntax error in expression, near `'\\." \ + "p , in C" set test "break , in C" gdb_test_multiple "break " $test { - -re "Function \"\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" { - gdb_test_no_output "n" $test - } + -re "Function \"\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" { + gdb_test_no_output "n" $test + } } set test "break , in C" gdb_test_multiple "break " $test { - -re "Function \"\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" { - gdb_test_no_output "n" $test - } + -re "Function \"\" not defined\\..*Make breakpoint pending on future shared library load.*y or .n.. $" { + gdb_test_no_output "n" $test + } } diff --git a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp index f88aa13c0d7..3df69574969 100644 --- a/gdb/testsuite/gdb.ada/bp_enum_homonym.exp +++ b/gdb/testsuite/gdb.ada/bp_enum_homonym.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} # Force GDB to convert the psymtab of pck.adb into a symtab. gdb_test "list pck.adb:1" \ - "$decimal\[ \t\]+-- Copyright.*" + "$decimal\[ \t\]+-- Copyright.*" # Break on subprogram "Archive". There is an enumeral that's an # homonym, so verify that GDB doesn't provide the choice between @@ -35,7 +35,7 @@ gdb_test "list pck.adb:1" \ # Instead, it should insert the breakpoint on the function alone. gdb_test "break archive" \ - "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\." + "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\." # Run the program. Make sure the program runs until it hits # the breakpoint and that the debugger does not unexpectedly ask @@ -45,5 +45,5 @@ gdb_test "break archive" \ gdb_run_cmd gdb_test "" \ - "Breakpoint $decimal, pck\\.archive \\(\\).*" \ - "run to pck.archive breakpoint" + "Breakpoint $decimal, pck\\.archive \\(\\).*" \ + "run to pck.archive breakpoint" diff --git a/gdb/testsuite/gdb.ada/bp_fun_addr.exp b/gdb/testsuite/gdb.ada/bp_fun_addr.exp index 57fc924fde3..a5ec03fff74 100644 --- a/gdb/testsuite/gdb.ada/bp_fun_addr.exp +++ b/gdb/testsuite/gdb.ada/bp_fun_addr.exp @@ -26,9 +26,9 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { clean_restart ${testfile} gdb_test "break *bp_fun_addr'address" \ - "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at.*: file .*bp_fun_addr.adb, line \[0-9\]+." gdb_run_cmd gdb_test "" \ - "Breakpoint $decimal, bp_fun_addr \\(\\).*" \ - "run until breakpoint at bp_fun_addr'address" + "Breakpoint $decimal, bp_fun_addr \\(\\).*" \ + "run until breakpoint at bp_fun_addr'address" diff --git a/gdb/testsuite/gdb.ada/bp_inlined_func.exp b/gdb/testsuite/gdb.ada/bp_inlined_func.exp index 70e0eadf758..145ce0a0213 100644 --- a/gdb/testsuite/gdb.ada/bp_inlined_func.exp +++ b/gdb/testsuite/gdb.ada/bp_inlined_func.exp @@ -20,21 +20,21 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} if {![runto_main]} { - return + return } # Check that inserting breakpoint on read_small inlined function inserts # 4 breakpoints (or possibly 5, including the read_small function itself). gdb_test "break read_small" \ - "Breakpoint $decimal at $hex: read_small\\. \\(\[45\] locations\\)" \ - "set breakpoint at read_small" + "Breakpoint $decimal at $hex: read_small\\. \\(\[45\] locations\\)" \ + "set breakpoint at read_small" # We do not verify each breakpoint info, but use continue commands instead # to verify that we properly stop on each expected breakpoint. @@ -50,5 +50,5 @@ for {set i 0} {$i < 4} {incr i} { } gdb_test "continue" \ - "Continuing\\..*$inferior_exited_re.*" \ - "continuing to program completion" + "Continuing\\..*$inferior_exited_re.*" \ + "continuing to program completion" diff --git a/gdb/testsuite/gdb.ada/bp_on_var.exp b/gdb/testsuite/gdb.ada/bp_on_var.exp index 34197198d59..6d2b686c62f 100644 --- a/gdb/testsuite/gdb.ada/bp_on_var.exp +++ b/gdb/testsuite/gdb.ada/bp_on_var.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } # Test inserting breakpoint on pck.my_global_variable. @@ -33,7 +33,7 @@ clean_restart ${testfile} gdb_test_no_output "set breakpoint pending off" "disable pending breakpoints" gdb_test "break pck.my_global_variable" \ - "Function \"pck\\.my_global_variable\" not defined\\." + "Function \"pck\\.my_global_variable\" not defined\\." # Test inserting breakpoint on pck.my_hidden_variable. @@ -44,4 +44,4 @@ gdb_test_no_output "set breakpoint pending off" \ "disable pending breakpoints after restart" gdb_test "break pck.my_hidden_variable" \ - "Function \"pck\\.my_hidden_variable\" not defined\\." + "Function \"pck\\.my_hidden_variable\" not defined\\." diff --git a/gdb/testsuite/gdb.ada/bp_range_type.exp b/gdb/testsuite/gdb.ada/bp_range_type.exp index cb99df8e36f..9fa1afdbf8b 100644 --- a/gdb/testsuite/gdb.ada/bp_range_type.exp +++ b/gdb/testsuite/gdb.ada/bp_range_type.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -28,12 +28,12 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] gdb_test "break foo.adb:$bp_location if small_value > 20" \ - "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\." + "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\." gdb_run_cmd gdb_test "" \ - "Breakpoint $decimal, foo \\(\\).*" \ - "run to breakpoint" + "Breakpoint $decimal, foo \\(\\).*" \ + "run to breakpoint" # Verify that we stopped at the correct iteration. gdb_test "print small_value" " = 25" diff --git a/gdb/testsuite/gdb.ada/bp_reset.exp b/gdb/testsuite/gdb.ada/bp_reset.exp index 0d679b300fd..2f6854b293c 100644 --- a/gdb/testsuite/gdb.ada/bp_reset.exp +++ b/gdb/testsuite/gdb.ada/bp_reset.exp @@ -20,16 +20,16 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} gdb_test "break nested_sub" \ - "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\." + "Breakpoint $decimal at $hex: file .*foo.adb, line $decimal\\." gdb_test "break do_nothing" \ - "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\." + "Breakpoint $decimal at $hex: file .*pck.adb, line $decimal\\." # Run the program. Make sure the program runs until it hits # the first breakpoint inside nested_sub. diff --git a/gdb/testsuite/gdb.ada/break-label.exp b/gdb/testsuite/gdb.ada/break-label.exp index 597e227bf55..b92a665ef86 100644 --- a/gdb/testsuite/gdb.ada/break-label.exp +++ b/gdb/testsuite/gdb.ada/break-label.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile proc if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} { - return + return } # Ada is case-insensitive, so both of these should work. diff --git a/gdb/testsuite/gdb.ada/byte_packed_arr.exp b/gdb/testsuite/gdb.ada/byte_packed_arr.exp index f98add26842..8251bd555d5 100644 --- a/gdb/testsuite/gdb.ada/byte_packed_arr.exp +++ b/gdb/testsuite/gdb.ada/byte_packed_arr.exp @@ -29,4 +29,4 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/reprod.adb] runto "reprod.adb:$bp_location" gdb_test "print broken" \ - " = \\(len => 1, data => \\(\\(i => 1\\)\\)\\)" + " = \\(len => 1, data => \\(\\(i => 1\\)\\)\\)" diff --git a/gdb/testsuite/gdb.ada/call_pn.exp b/gdb/testsuite/gdb.ada/call_pn.exp index 7426f13056c..ff234b9aa99 100644 --- a/gdb/testsuite/gdb.ada/call_pn.exp +++ b/gdb/testsuite/gdb.ada/call_pn.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } # The xfail mentioned below triggers for the "after" print, but may not diff --git a/gdb/testsuite/gdb.ada/catch_assert_if.exp b/gdb/testsuite/gdb.ada/catch_assert_if.exp index ffdf05ad7b0..c64db6f1fcf 100644 --- a/gdb/testsuite/gdb.ada/catch_assert_if.exp +++ b/gdb/testsuite/gdb.ada/catch_assert_if.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile bla if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } clean_restart ${testfile} @@ -35,12 +35,12 @@ set sp "\[ \t\]*" # - continue, the program exits. if {![runto_main]} { - return + return } gdb_test "catch assert if Global_Var = 2" \ - "Catchpoint $decimal: failed Ada assertions" \ - "insert catchpoint on failed assertions with condition" + "Catchpoint $decimal: failed Ada assertions" \ + "insert catchpoint on failed assertions with condition" # Check that condition is stored and properly displayed. @@ -50,11 +50,11 @@ gdb_test "info breakpoint" $exp_bp "Check catch assertions with condition" set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb] set catchpoint_msg \ - "Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location" + "Catchpoint $decimal, failed assertion at $hex in bla \\\(\\\).*at .*bla.adb:$bp_location" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*STOP" \ - "continuing to expected failed assertion" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*STOP" \ + "continuing to expected failed assertion" gdb_test "continue" \ - "Continuing\\..*$inferior_exited_re.*" \ - "continuing to program completion" + "Continuing\\..*$inferior_exited_re.*" \ + "continuing to program completion" diff --git a/gdb/testsuite/gdb.ada/catch_ex.exp b/gdb/testsuite/gdb.ada/catch_ex.exp index 44cf982fd44..0051aa34686 100644 --- a/gdb/testsuite/gdb.ada/catch_ex.exp +++ b/gdb/testsuite/gdb.ada/catch_ex.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } clean_restart ${testfile} @@ -34,14 +34,14 @@ set sp "\[ \t\]*" set info_break_header "Num${sp}Type${sp}Disp${sp}Enb${sp}Address${sp}What" set catch_exception_info \ - "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}all Ada exceptions" + "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}all Ada exceptions" #################################### # 1. Try catching all exceptions. # #################################### if {![runto_main]} { - return + return } gdb_test "catch exception" \ @@ -49,20 +49,20 @@ gdb_test "catch exception" \ "insert catchpoint on all Ada exceptions" gdb_test "info break" \ - "$info_break_header$eol.*$catch_exception_info" \ - "info break, catch all Ada exceptions" + "$info_break_header$eol.*$catch_exception_info" \ + "info break, catch all Ada exceptions" set catchpoint_msg \ - "Catchpoint $any_nb, CONSTRAINT_ERROR (\\\(ignore C_E\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Catchpoint $any_nb, CONSTRAINT_ERROR (\\\(ignore C_E\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT1" \ - "continuing to first exception" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT1" \ + "continuing to first exception" set catchpoint_msg \ - "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo\\.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo\\.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ - "continuing to second exception" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ + "continuing to second exception" ################################################ # 2. Try catching only some of the exceptions. # @@ -79,53 +79,53 @@ gdb_test "continue" \ # - continue, the program exits. if {![runto_main]} { - return + return } gdb_test "catch exception Program_Error" \ - "Catchpoint $any_nb: \`Program_Error' Ada exception" \ - "insert catchpoint on Program_Error" + "Catchpoint $any_nb: \`Program_Error' Ada exception" \ + "insert catchpoint on Program_Error" gdb_test "catch assert" \ - "Catchpoint $any_nb: failed Ada assertions" \ - "insert catchpoint on failed assertions" + "Catchpoint $any_nb: failed Ada assertions" \ + "insert catchpoint on failed assertions" gdb_test "catch exception unhandled" \ - "Catchpoint $any_nb: unhandled Ada exceptions" \ - "insert catchpoint on unhandled exceptions" + "Catchpoint $any_nb: unhandled Ada exceptions" \ + "insert catchpoint on unhandled exceptions" set catch_exception_entry \ - "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}\`Program_Error' Ada exception" + "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}\`Program_Error' Ada exception" set catch_assert_entry \ - "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}failed Ada assertions" + "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}failed Ada assertions" set catch_unhandled_entry \ - "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}unhandled Ada exceptions" + "$any_nb${sp}catchpoint${sp}keep${sp}y${sp}unhandled Ada exceptions" gdb_test "info break" \ - "$info_break_header$eol.*$catch_exception_entry$eol$catch_assert_entry$eol$catch_unhandled_entry" \ - "info break, second run" + "$info_break_header$eol.*$catch_exception_entry$eol$catch_assert_entry$eol$catch_unhandled_entry" \ + "info break, second run" set catchpoint_msg \ - "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Catchpoint $any_nb, PROGRAM_ERROR (\\\(foo.adb:$decimal explicit raise\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ - "continuing to Program_Error exception" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT2" \ + "continuing to Program_Error exception" set catchpoint_msg \ - "Catchpoint $any_nb, failed assertion at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Catchpoint $any_nb, failed assertion at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT3" \ - "continuing to failed assertion" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT3" \ + "continuing to failed assertion" set catchpoint_msg \ - "Catchpoint $any_nb, unhandled CONSTRAINT_ERROR at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Catchpoint $any_nb, unhandled CONSTRAINT_ERROR at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT4" \ - "continuing to unhandled exception" + "Continuing\\.$eol$eol$catchpoint_msg$eol.*SPOT4" \ + "continuing to unhandled exception" gdb_test "continue" \ - "Continuing\\..*$inferior_exited_re.*" \ - "continuing to program completion" + "Continuing\\..*$inferior_exited_re.*" \ + "continuing to program completion" ################################# # 3. Try temporary catchpoints. # @@ -139,17 +139,17 @@ gdb_test "continue" \ # the program. if {![runto_main]} { - return + return } gdb_test "tcatch exception" \ - "Temporary catchpoint $any_nb: all Ada exceptions" + "Temporary catchpoint $any_nb: all Ada exceptions" set temp_catchpoint_msg \ - "Temporary catchpoint $any_nb, CONSTRAINT_ERROR (\\\(.*\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" + "Temporary catchpoint $any_nb, CONSTRAINT_ERROR (\\\(.*\\\) )?at $any_addr in foo \\\(\\\).*at .*foo.adb:$any_nb" gdb_test "continue" \ - "Continuing\\.$eol$eol$temp_catchpoint_msg$eol.*SPOT1" \ - "continuing to temporary catchpoint" + "Continuing\\.$eol$eol$temp_catchpoint_msg$eol.*SPOT1" \ + "continuing to temporary catchpoint" with_test_prefix "temporary catchpoint" { gdb_test "continue" \ diff --git a/gdb/testsuite/gdb.ada/catch_ex_std.exp b/gdb/testsuite/gdb.ada/catch_ex_std.exp index 2f6050ba572..7e3e9450214 100644 --- a/gdb/testsuite/gdb.ada/catch_ex_std.exp +++ b/gdb/testsuite/gdb.ada/catch_ex_std.exp @@ -66,7 +66,7 @@ clean_restart ${testfile} gdb_load_shlib $sofile if {![runto_main]} { - return + return } gdb_test "catch exception some_kind_of_error" \ diff --git a/gdb/testsuite/gdb.ada/char_enum.exp b/gdb/testsuite/gdb.ada/char_enum.exp index ef81e8f6855..78e2545cec6 100644 --- a/gdb/testsuite/gdb.ada/char_enum.exp +++ b/gdb/testsuite/gdb.ada/char_enum.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/char_enum_overload.exp b/gdb/testsuite/gdb.ada/char_enum_overload.exp index 73154ef162d..f2c4ec40ef0 100644 --- a/gdb/testsuite/gdb.ada/char_enum_overload.exp +++ b/gdb/testsuite/gdb.ada/char_enum_overload.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/char_enum_unicode.exp b/gdb/testsuite/gdb.ada/char_enum_unicode.exp index 164722e5546..6bba61c1f78 100644 --- a/gdb/testsuite/gdb.ada/char_enum_unicode.exp +++ b/gdb/testsuite/gdb.ada/char_enum_unicode.exp @@ -21,7 +21,7 @@ standard_ada_testfile foo set flags [list debug additional_flags=-gnatW8] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/char_param.exp b/gdb/testsuite/gdb.ada/char_param.exp index 53d4225fbf2..5ab33d82435 100644 --- a/gdb/testsuite/gdb.ada/char_param.exp +++ b/gdb/testsuite/gdb.ada/char_param.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -34,21 +34,21 @@ runto "foo.adb:$bp_location" # the function call. gdb_test "print procedure_result" \ - "= 32 ' '" \ - "print procedure_result before calling same" + "= 32 ' '" \ + "print procedure_result before calling same" gdb_test "call same (first)" \ - "" \ - "call same" + "" \ + "call same" gdb_test "print procedure_result" \ - "= 97 'a'" \ - "print procedure_result after calling same" + "= 97 'a'" \ + "print procedure_result after calling same" gdb_test "call next (first)" \ - "= 98 'b'" \ - "call next" + "= 98 'b'" \ + "call next" gdb_test "print procedure_result" \ - "= 98 'b'" \ - "print procedure_result after calling next" + "= 98 'b'" \ + "print procedure_result after calling next" diff --git a/gdb/testsuite/gdb.ada/complete.exp b/gdb/testsuite/gdb.ada/complete.exp index 2f2abb05e3c..8b88591916f 100644 --- a/gdb/testsuite/gdb.ada/complete.exp +++ b/gdb/testsuite/gdb.ada/complete.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -50,7 +50,7 @@ proc test_gdb_complete { expr expected_output {msg ""} } { set msg $cmd } gdb_test "complete p $expr" \ - "$expected_output" $msg + "$expected_output" $msg } # A convenience function that verifies that the "complete EXPR" command @@ -63,12 +63,12 @@ proc test_gdb_no_completion { expr } { # Try a global variable, only one match should be found: test_gdb_complete "my_glob" \ - "p my_global_variable" + "p my_global_variable" # A global variable, inside a nested package: test_gdb_complete "insi" \ - "p inside_variable" + "p inside_variable" # A global variable inside a nested package, but only giving part of # the fully qualified name (top level package name missing): @@ -77,16 +77,16 @@ test_gdb_no_completion "inner.insi" # An incomplete nested package name, were lies a single symbol: test_gdb_complete "pck.inne" \ - "p pck.inner.inside_variable" \ - "complete nested package name" + "p pck.inner.inside_variable" \ + "complete nested package name" # A fully qualified symbol name, mangled... test_gdb_complete "pck__inner__ins" \ - "p pck__inner__inside_variable" + "p pck__inner__inside_variable" # A fully qualified symbol name... test_gdb_complete "pck.inner.ins" \ - "p pck.inner.inside_variable" + "p pck.inner.inside_variable" # Make sure that "inside" is not returned as a possible completion # for "side"... @@ -98,7 +98,7 @@ test_gdb_no_completion "exported" # check the "<...>" notation. test_gdb_complete "" + "p " # While at it, make sure we can print the symbol too, using the '<' # notation. @@ -112,16 +112,16 @@ gdb_test "p exported_capitalized" \ # A global symbol, created by the binder, that starts with __gnat... test_gdb_complete "__gnat_ada_main_progra" \ - "p __gnat_ada_main_program_name" + "p __gnat_ada_main_program_name" # A global symbol, created by the binder, that starts with __gnat, # and using the '<' notation. test_gdb_complete "<__gnat_ada_main_prog" \ - "p <__gnat_ada_main_program_name>" + "p <__gnat_ada_main_program_name>" # A local variable test_gdb_complete "some" \ - "p some_local_variable" + "p some_local_variable" # A local variable variable, but in a different procedure. No match # should be returned. @@ -132,7 +132,7 @@ test_gdb_no_completion "pck.ins" # A fully qualified variable name that does exist... test_gdb_complete "pck.my" \ - "p pck.my_global_variable" + "p pck.my_global_variable" # A fully qualified package name test_gdb_complete "pck.inner" \ @@ -141,28 +141,28 @@ test_gdb_complete "pck.inner" \ # A fully qualified package name, with a dot at the end test_gdb_complete "pck.inner." \ - "p pck.inner.inside_variable" + "p pck.inner.inside_variable" # Two matches, from the global scope: test_gdb_complete "local_ident" \ - [multi_line "p local_identical_one" \ - "p local_identical_two" ] + [multi_line "p local_identical_one" \ + "p local_identical_two" ] # Two matches, from the global scope, but using fully qualified names: test_gdb_complete "pck.local_ident" \ - [multi_line "p pck.local_identical_one" \ - "p pck.local_identical_two" ] + [multi_line "p pck.local_identical_one" \ + "p pck.local_identical_two" ] # Two matches, from the global scope, but using mangled fully qualified # names: test_gdb_complete "pck__local_ident" \ - [multi_line "p pck__local_identical_one" \ - "p pck__local_identical_two" ] + [multi_line "p pck__local_identical_one" \ + "p pck__local_identical_two" ] # Two matches, one from the global scope, the other from the local scope: test_gdb_complete "external_ident" \ - [multi_line "p external_identical_one" \ - "p external_identical_two" ] + [multi_line "p external_identical_one" \ + "p external_identical_two" ] # Complete on the name of package. test_gdb_complete "pck" \ @@ -198,7 +198,7 @@ test_gdb_complete "pck." \ # Complete a mangled symbol name, but using the '<...>' notation. test_gdb_complete "" + "p " # Very simple completion, but using the interactive form, this time. # The verification we are trying to make involves the event loop, @@ -224,12 +224,12 @@ if { [readline_is_used] } { # which users can select a specific function. This should not happen during # completion, though. test_gdb_complete "ambig" \ - [multi_line "p ambiguous_func" \ - "p ambiguous_proc" ] + [multi_line "p ambiguous_func" \ + "p ambiguous_proc" ] test_gdb_complete "ambiguous_f" \ - "p ambiguous_func" + "p ambiguous_func" test_gdb_complete "ambiguous_func" \ - "p ambiguous_func" + "p ambiguous_func" # Perform a test intended to verify the behavior where the number # of possible completions is very large. The goal is not to verify diff --git a/gdb/testsuite/gdb.ada/cond_lang.exp b/gdb/testsuite/gdb.ada/cond_lang.exp index 994b2235357..017ab2eb784 100644 --- a/gdb/testsuite/gdb.ada/cond_lang.exp +++ b/gdb/testsuite/gdb.ada/cond_lang.exp @@ -25,7 +25,7 @@ set cobject [standard_output_file ${cfile}.o] gdb_compile "${csrcfile}" "${cobject}" object [list debug] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -33,7 +33,7 @@ clean_restart ${testfile} # Run to c_function an verify that the language automatically gets set to C. runto c_function gdb_test "show lang" \ - "The current source language is \"auto; currently c\"\\." + "The current source language is \"auto; currently c\"\\." # Now, insert a breakpoint inside an Ada unit, using a condition written # in Ada. Even though the current language is "auto; currently c", we @@ -41,11 +41,11 @@ gdb_test "show lang" \ # current language mode is auto, and the breakpoint is inside Ada code. set bp_location [gdb_get_line_number "STOP" ${testdir}/mixed.adb] gdb_test "break mixed.adb:${bp_location} if light = green" \ - "Breakpoint \[0-9\]* at .*: file (.*/)?mixed.adb, line \[0-9\]*\\." + "Breakpoint \[0-9\]* at .*: file (.*/)?mixed.adb, line \[0-9\]*\\." # Now, continue until we hit the breakpoint. If the condition is # evaluated correctly, the first hit will be ignored, and the debugger # will stop at the second hit only, when the "light" argument is equal # to green. gdb_test "continue" \ - "Breakpoint \[0-9\]*, mixed\\.break_me \\(light=green\\) at .*" + "Breakpoint \[0-9\]*, mixed\\.break_me \\(light=green\\) at .*" diff --git a/gdb/testsuite/gdb.ada/convvar_comp.exp b/gdb/testsuite/gdb.ada/convvar_comp.exp index eeb3b1d147c..b6652e837bf 100644 --- a/gdb/testsuite/gdb.ada/convvar_comp.exp +++ b/gdb/testsuite/gdb.ada/convvar_comp.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile pb16_063 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -28,7 +28,7 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "BREAK" "$testdir/pck.adb"] if {![runto pck.adb:$bp_location]} { - return + return } set val "" diff --git a/gdb/testsuite/gdb.ada/dgopt.exp b/gdb/testsuite/gdb.ada/dgopt.exp index a1b7ab21b79..9e8e8a676a8 100644 --- a/gdb/testsuite/gdb.ada/dgopt.exp +++ b/gdb/testsuite/gdb.ada/dgopt.exp @@ -23,7 +23,7 @@ standard_ada_testfile x if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \ {debug additional_flags=-gnatDG}] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/disc_arr_bound.exp b/gdb/testsuite/gdb.ada/disc_arr_bound.exp index cc7bb6435a7..e4fb834fa50 100644 --- a/gdb/testsuite/gdb.ada/disc_arr_bound.exp +++ b/gdb/testsuite/gdb.ada/disc_arr_bound.exp @@ -20,18 +20,18 @@ require allow_ada_tests standard_ada_testfile foo_n612_026 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_n612_026.adb] if {![runto "foo_n612_026.adb:$bp_location"]} { - return + return } gdb_test "print r" \ - " = \\(n => 10, a => \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)\\)" + " = \\(n => 10, a => \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)\\)" gdb_test "print r.a" \ - " = \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)" + " = \\(10, 20, 30, 40, 50, 60, 70, 80, 90, 100\\)" diff --git a/gdb/testsuite/gdb.ada/discrete-char.exp b/gdb/testsuite/gdb.ada/discrete-char.exp index 5d49dbcf1b4..cfc56763be5 100644 --- a/gdb/testsuite/gdb.ada/discrete-char.exp +++ b/gdb/testsuite/gdb.ada/discrete-char.exp @@ -29,7 +29,7 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/main.adb] if {![runto "main.adb:$bp_location"]} { - return + return } gdb_test_no_output "set print array-indexes on" diff --git a/gdb/testsuite/gdb.ada/dot_all.exp b/gdb/testsuite/gdb.ada/dot_all.exp index b5b0f4ab813..58d1ae96afb 100644 --- a/gdb/testsuite/gdb.ada/dot_all.exp +++ b/gdb/testsuite/gdb.ada/dot_all.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } gdb_test "print addr.all" " = 123" diff --git a/gdb/testsuite/gdb.ada/dyn_arrayidx.exp b/gdb/testsuite/gdb.ada/dyn_arrayidx.exp index f8180b8ffbe..f6f1dfdda10 100644 --- a/gdb/testsuite/gdb.ada/dyn_arrayidx.exp +++ b/gdb/testsuite/gdb.ada/dyn_arrayidx.exp @@ -33,4 +33,4 @@ runto "foo.adb:$bp_location" gdb_test_no_output "maintenance set ada ignore-descriptive-types" gdb_test "ptype array_type" \ - " = array \\(5 \\.\\. 10\\) of natural" \ + " = array \\(5 \\.\\. 10\\) of natural" \ diff --git a/gdb/testsuite/gdb.ada/dyn_loc.exp b/gdb/testsuite/gdb.ada/dyn_loc.exp index 475a96b5ef6..e53ed3182d9 100644 --- a/gdb/testsuite/gdb.ada/dyn_loc.exp +++ b/gdb/testsuite/gdb.ada/dyn_loc.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "BREAK" ${testdir}/pack.adb] if {![runto "pack.adb:$bp_location"]} { - return + return } set eol "\r\n" diff --git a/gdb/testsuite/gdb.ada/dyn_stride.exp b/gdb/testsuite/gdb.ada/dyn_stride.exp index 31df509efd2..3febb39a627 100644 --- a/gdb/testsuite/gdb.ada/dyn_stride.exp +++ b/gdb/testsuite/gdb.ada/dyn_stride.exp @@ -20,27 +20,27 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } gdb_test "print A1(1)" \ - "\\(i => 0, s => \"\"\\)" + "\\(i => 0, s => \"\"\\)" gdb_test "print A1(2)" \ - "\\(i => 1, s => \"A\"\\)" + "\\(i => 1, s => \"A\"\\)" gdb_test "print A1(3)" \ - "\\(i => 2, s => \"AB\"\\)" + "\\(i => 2, s => \"AB\"\\)" gdb_test "print A1(1..3)" \ - "\\(\\(i => 0, s => \"\"\\), \\(i => 1, s => \"A\"\\), \\(i => 2, s => \"AB\"\\)\\)" + "\\(\\(i => 0, s => \"\"\\), \\(i => 1, s => \"A\"\\), \\(i => 2, s => \"AB\"\\)\\)" # Test the use of the "repeat" operator (@). # @@ -59,4 +59,4 @@ gdb_test "print A1(1..3)" \ # of the array). gdb_test "print a1(1)@3" \ - " = \\(\\(i => 0, s => \"\"\\), \\(i => -?$decimal, s => .*\\), \\(i => -?$decimal, s => .*\\)\\)" + " = \\(\\(i => 0, s => \"\"\\), \\(i => -?$decimal, s => .*\\), \\(i => -?$decimal, s => .*\\)\\)" diff --git a/gdb/testsuite/gdb.ada/dynamic-iface.exp b/gdb/testsuite/gdb.ada/dynamic-iface.exp index 8b5a0d74287..d521a1ba1ea 100644 --- a/gdb/testsuite/gdb.ada/dynamic-iface.exp +++ b/gdb/testsuite/gdb.ada/dynamic-iface.exp @@ -22,7 +22,7 @@ require gnat_runtime_has_debug_info standard_ada_testfile main if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug additional_flags=-gnat05}] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/enums_overload.exp b/gdb/testsuite/gdb.ada/enums_overload.exp index 151f14bb59c..80a57fbf13f 100644 --- a/gdb/testsuite/gdb.ada/enums_overload.exp +++ b/gdb/testsuite/gdb.ada/enums_overload.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile enums_overload_main if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/excep_handle.exp b/gdb/testsuite/gdb.ada/excep_handle.exp index c071d5811fe..763c98ef2b8 100644 --- a/gdb/testsuite/gdb.ada/excep_handle.exp +++ b/gdb/testsuite/gdb.ada/excep_handle.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } clean_restart ${testfile} @@ -32,16 +32,16 @@ set sp "\[ \t\]*" set when "when" set catchpoint_constraint_error_msg \ - "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Constraint_Error =>" + "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Constraint_Error =>" set catchpoint_program_error_msg \ - "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Program_Error =>" + "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Program_Error =>" set catchpoint_storage_error_msg \ - "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Storage_Error =>" + "Catchpoint $decimal, exception at $hex in foo \\\(\\\).*at .*foo.adb:$decimal$eol$decimal$sp$when Storage_Error =>" if {![runto_main]} { - return + return } ############################################ @@ -70,7 +70,7 @@ gdb_test "continue" \ "continuing and stopping in Storage_Error exception handlers" gdb_test_no_output "delete 2" \ - "delete catchpoint on all Ada exceptions handlers" + "delete catchpoint on all Ada exceptions handlers" ################################################## # 2. Try catching some named exception handlers. # @@ -79,8 +79,8 @@ gdb_test_no_output "delete 2" \ # Insert a catchpoint on Program_Error Ada exception handlers. gdb_test "catch handlers Program_Error" \ - "Catchpoint $decimal: `Program_Error' Ada exception handlers" \ - "insert catchpoint on Program_Error Ada exception handlers" + "Catchpoint $decimal: `Program_Error' Ada exception handlers" \ + "insert catchpoint on Program_Error Ada exception handlers" # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. @@ -95,8 +95,8 @@ gdb_test_no_output \ # Insert a catchpoint on Storage_Error Ada exception handlers. gdb_test "catch handlers Storage_Error" \ - "Catchpoint $decimal: `Storage_Error' Ada exception handlers" \ - "insert catchpoint on Storage_Error Ada exception handlers" + "Catchpoint $decimal: `Storage_Error' Ada exception handlers" \ + "insert catchpoint on Storage_Error Ada exception handlers" # Continue, we should stop at Storage_Error handlers. @@ -115,13 +115,13 @@ gdb_test_no_output \ # Insert a catchpoint on all Ada exceptions handlers with condition. gdb_test "catch handlers if Global_Var = 2" \ - "Catchpoint $decimal: all Ada exceptions handlers" \ - "insert catchpoint on all Ada exception handlers with condition" + "Catchpoint $decimal: all Ada exceptions handlers" \ + "insert catchpoint on all Ada exception handlers with condition" # Check that condition is stored and properly displayed. gdb_test "info breakpoint" "stop only if Global_Var = 2" \ - "Check catch handlers with condition" + "Check catch handlers with condition" # Continue, we should not stop at ABORT_SIGNAL but at Program_Error one. @@ -154,5 +154,5 @@ gdb_test "continue" \ # Continue, the program should exit properly. gdb_test "continue" \ - "Continuing\\..*$inferior_exited_re.*" \ - "continuing to program completion" + "Continuing\\..*$inferior_exited_re.*" \ + "continuing to program completion" diff --git a/gdb/testsuite/gdb.ada/exec_changed.exp b/gdb/testsuite/gdb.ada/exec_changed.exp index 42cd5c08f6d..1266b5fd849 100644 --- a/gdb/testsuite/gdb.ada/exec_changed.exp +++ b/gdb/testsuite/gdb.ada/exec_changed.exp @@ -56,8 +56,8 @@ if { [gdb_start_cmd] < 0 } { } gdb_test "" \ - "first \\(\\) at .*first.adb.*" \ - "start first" + "first \\(\\) at .*first.adb.*" \ + "start first" # Restore first executable to its original name, and move # second executable into its place. Ensure that the new @@ -78,8 +78,8 @@ if { [gdb_start_cmd] < 0 } { fail "start second" } else { gdb_test "" \ - "second \\(\\) at .*second.adb.*" \ - "start second" + "second \\(\\) at .*second.adb.*" \ + "start second" } # Try again, this time with just changing the file time of first. diff --git a/gdb/testsuite/gdb.ada/expr_delims.exp b/gdb/testsuite/gdb.ada/expr_delims.exp index 2398f10d6f1..b3587424409 100644 --- a/gdb/testsuite/gdb.ada/expr_delims.exp +++ b/gdb/testsuite/gdb.ada/expr_delims.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -36,32 +36,32 @@ gdb_run_cmd gdb_test "" "Breakpoint $decimal, foo \\(\\).*" \ "run to foo" gdb_test "continue" \ - "Continuing\\..*Breakpoint $decimal, foo \\(\\).*" + "Continuing\\..*Breakpoint $decimal, foo \\(\\).*" # Make sure that "thread" may be used as a variable without being mistaken # for an expression delimiter. gdb_test "print thread" \ - "= 1" \ - "print variable 'thread'" + "= 1" \ + "print variable 'thread'" gdb_test_no_output "delete 1" gdb_test "watch thread" \ - ".*atchpoint \[0-9\]+: thread" \ - "set plain watchpoint on variable 'thread'" + ".*atchpoint \[0-9\]+: thread" \ + "set plain watchpoint on variable 'thread'" # Make sure that 'if' when followed by an expression beginning # with 'i' works. gdb_test "watch thread if i = 2" \ - ".*atchpoint \[0-9\]+: thread" \ - "set conditional watchpoint." + ".*atchpoint \[0-9\]+: thread" \ + "set conditional watchpoint." gdb_test "info break" \ - ".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \ - "check that watchpoint is set correctly." + ".*${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}.*atchpoint${ws}keep${ws}y${ws}thread${ws}stop only if i = 2" \ + "check that watchpoint is set correctly." # Check for right error when using both 'if' and 'thread' clauses. gdb_test "break foo.adb:$bp_location if thread = 10 thread 999" \ - ".*Unknown thread 999\\." \ - "combination of 'if' and 'thread' delimiters." + ".*Unknown thread 999\\." \ + "combination of 'if' and 'thread' delimiters." diff --git a/gdb/testsuite/gdb.ada/expr_with_funcall.exp b/gdb/testsuite/gdb.ada/expr_with_funcall.exp index 85c5550909c..3402a5c7dc3 100644 --- a/gdb/testsuite/gdb.ada/expr_with_funcall.exp +++ b/gdb/testsuite/gdb.ada/expr_with_funcall.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile expr_r821_013 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/exprs.exp b/gdb/testsuite/gdb.ada/exprs.exp index 0f246be0071..aef904676e2 100644 --- a/gdb/testsuite/gdb.ada/exprs.exp +++ b/gdb/testsuite/gdb.ada/exprs.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/extended-access.exp b/gdb/testsuite/gdb.ada/extended-access.exp index d75545e4825..c1c43bef10b 100644 --- a/gdb/testsuite/gdb.ada/extended-access.exp +++ b/gdb/testsuite/gdb.ada/extended-access.exp @@ -24,7 +24,7 @@ if {[prepare_for_testing "failed to prepare" ${testfile} ${srcfile}]} { # For riscv64-linux, we need to run to main, or the_array.p_array will still # be nullptr. if {![runto "main"]} { - return + return } # The test case is written in C, because it was easy to make the diff --git a/gdb/testsuite/gdb.ada/fin_fun_out.exp b/gdb/testsuite/gdb.ada/fin_fun_out.exp index 391707ab069..d648295dfb0 100644 --- a/gdb/testsuite/gdb.ada/fin_fun_out.exp +++ b/gdb/testsuite/gdb.ada/fin_fun_out.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_o525_013 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -33,8 +33,8 @@ runto "bar.f" # to display, depending on the ABI. The objective of the test is # to verify that we don't crash, so keep the expected output simple... gdb_test "finish" \ - ".*Value returned.*" + ".*Value returned.*" # Verify that GDB is still alive... gdb_test "print 1" \ - "= 1" + "= 1" diff --git a/gdb/testsuite/gdb.ada/finish-large.exp b/gdb/testsuite/gdb.ada/finish-large.exp index b2caca1e164..24eb103b6bc 100644 --- a/gdb/testsuite/gdb.ada/finish-large.exp +++ b/gdb/testsuite/gdb.ada/finish-large.exp @@ -22,11 +22,11 @@ standard_ada_testfile p set flags {debug} if {[ada_fvar_tracking]} { - lappend flags "additional_flags=-fvar-tracking" + lappend flags "additional_flags=-fvar-tracking" } if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/finish-var-size.exp b/gdb/testsuite/gdb.ada/finish-var-size.exp index 2e909db29ec..51c056a9106 100644 --- a/gdb/testsuite/gdb.ada/finish-var-size.exp +++ b/gdb/testsuite/gdb.ada/finish-var-size.exp @@ -29,7 +29,7 @@ if { [ada_fvar_tracking] } { } if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $opts] != ""} { - return + return } clean_restart ${testfile} @@ -40,7 +40,7 @@ set value [string_to_regexp "= (defined => true, payload => true)"] # With some ABIs the return value cannot be determined. Accept this, # or the correct result. gdb_test "finish" \ - "Value returned .*($value|Cannot determine contents)" + "Value returned .*($value|Cannot determine contents)" # Test that an inferior call yields the correct result. gdb_test "print pck.get(True)" $value diff --git a/gdb/testsuite/gdb.ada/fixed_cmp.exp b/gdb/testsuite/gdb.ada/fixed_cmp.exp index 2c3aaa6c2c2..6bcb157b3c9 100644 --- a/gdb/testsuite/gdb.ada/fixed_cmp.exp +++ b/gdb/testsuite/gdb.ada/fixed_cmp.exp @@ -23,7 +23,7 @@ foreach_gnat_encoding gnat_encodings flags {all minimal} { lappend flags debug if {[gdb_compile_ada "${srcfile}" "${binfile}-${gnat_encodings}" executable $flags] != "" } { - return + return } clean_restart ${testfile}-${gnat_encodings} @@ -32,16 +32,16 @@ foreach_gnat_encoding gnat_encodings flags {all minimal} { runto "fixed.adb:$bp_location" gdb_test "print My_Var > 10.0" \ - "= true" + "= true" gdb_test "print My_Var > 20.0" \ - "= false" + "= false" # Do the same, but with integer values. gdb_test "print My_Var > 10" \ - "= true" + "= true" gdb_test "print My_Var > 20" \ - "= false" + "= false" } diff --git a/gdb/testsuite/gdb.ada/fixed_points_function.exp b/gdb/testsuite/gdb.ada/fixed_points_function.exp index b7e20290b95..abe4e1f8d6d 100644 --- a/gdb/testsuite/gdb.ada/fixed_points_function.exp +++ b/gdb/testsuite/gdb.ada/fixed_points_function.exp @@ -29,10 +29,10 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/fixed_points_function.adb runto "fixed_points_function.adb:$bp_location" gdb_test "print call_fp1(1)" \ - " = 1" + " = 1" gdb_test "print call_fp1(0.5)" \ - " = 0.5" + " = 0.5" gdb_test "print call_fp1(-0.5)" \ - " = -0.5" + " = -0.5" diff --git a/gdb/testsuite/gdb.ada/float_param.exp b/gdb/testsuite/gdb.ada/float_param.exp index e6be564825a..c952ab721a6 100644 --- a/gdb/testsuite/gdb.ada/float_param.exp +++ b/gdb/testsuite/gdb.ada/float_param.exp @@ -30,12 +30,12 @@ runto "foo.adb:$bp_location" gdb_test_no_output "call set_float(2.0)" gdb_test "print global_float" \ - " = 2\\.0" + " = 2\\.0" gdb_test_no_output "call set_double(1, 3.0)" gdb_test "print global_double" \ - " = 3\\.0" + " = 3\\.0" gdb_test_no_output "call set_long_double(1, global_small_struct, 4.0)" gdb_test "print global_long_double" \ - " = 4\\.0" + " = 4\\.0" diff --git a/gdb/testsuite/gdb.ada/frame_args.exp b/gdb/testsuite/gdb.ada/frame_args.exp index 12ae6172819..5f38a1900e6 100644 --- a/gdb/testsuite/gdb.ada/frame_args.exp +++ b/gdb/testsuite/gdb.ada/frame_args.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -31,14 +31,14 @@ set eol "\r\n" set sp "\[ \t\]*" if {![runto break_me]} { - return + return } # First, print all the arrays without indexes gdb_test_no_output "set print frame-arguments scalars" \ - "set print frame-arguments scalars" + "set print frame-arguments scalars" gdb_test "frame 1" \ - "#1$sp$any_addr in pck.call_me \\(int=1, flt=2.0, bln=true, ary=\\.\\.\\., chr=106 'j', sad=\\(system.address\\) $any_addr, rec=\\.\\.\\.\\).*" \ - "display frame 1 with frame-arguments set to scalars" + "#1$sp$any_addr in pck.call_me \\(int=1, flt=2.0, bln=true, ary=\\.\\.\\., chr=106 'j', sad=\\(system.address\\) $any_addr, rec=\\.\\.\\.\\).*" \ + "display frame 1 with frame-arguments set to scalars" diff --git a/gdb/testsuite/gdb.ada/fullname_bp.exp b/gdb/testsuite/gdb.ada/fullname_bp.exp index 270653f80d4..0d991663f51 100644 --- a/gdb/testsuite/gdb.ada/fullname_bp.exp +++ b/gdb/testsuite/gdb.ada/fullname_bp.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } # Note: We restart the debugger before setting each breakpoint, because @@ -31,7 +31,7 @@ clean_restart ${testfile} # Break on "pck.hello" rather than just "hello" to make sure we trigger # the non-wild symbol lookup. gdb_test "break pck.hello" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." # Do the same, but this time using a linespec where the user also # provided a filename. @@ -39,7 +39,7 @@ gdb_test "break pck.hello" \ clean_restart ${testfile} gdb_test "break pck.adb:pck.hello" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." # Same scenarios as above, but with a function name that is spelled # with upper-case letters. @@ -47,9 +47,9 @@ gdb_test "break pck.adb:pck.hello" \ clean_restart ${testfile} gdb_test "break Pck.Hello" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." clean_restart ${testfile} gdb_test "break pck.adb:Pck.Hello" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at 0x\[0-9a-f\]+: file .*pck.adb, line \[0-9\]+." diff --git a/gdb/testsuite/gdb.ada/fun_addr.exp b/gdb/testsuite/gdb.ada/fun_addr.exp index d3c5d19f52a..e7c7790c5c0 100644 --- a/gdb/testsuite/gdb.ada/fun_addr.exp +++ b/gdb/testsuite/gdb.ada/fun_addr.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -29,4 +29,4 @@ clean_restart ${testfile} # the inferior is *not* running (no frame). gdb_test "print foo'address" \ - "= .* 0x\[0-9a-zA-Z\]+ " + "= .* 0x\[0-9a-zA-Z\]+ " diff --git a/gdb/testsuite/gdb.ada/fun_in_declare.exp b/gdb/testsuite/gdb.ada/fun_in_declare.exp index a9b03292368..2d73202ac18 100644 --- a/gdb/testsuite/gdb.ada/fun_in_declare.exp +++ b/gdb/testsuite/gdb.ada/fun_in_declare.exp @@ -20,13 +20,13 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} if {![runto_main]} { - return + return } # Some variables used to simplify the maintenance of some of @@ -36,9 +36,9 @@ set any_addr "0x\[0-9a-zA-Z\]+" set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] gdb_test "break foo.adb:$bp_location" \ - "Breakpoint $any_nb at $any_addr: file .*foo.adb, line $any_nb." \ - "insert breakpoint inside foo.call_me" + "Breakpoint $any_nb at $any_addr: file .*foo.adb, line $any_nb." \ + "insert breakpoint inside foo.call_me" gdb_test "continue" \ - ".*Breakpoint $any_nb, foo\\.call_me \\(\\) at .*foo.adb:$any_nb.*" \ - "decoding of function name" + ".*Breakpoint $any_nb, foo\\.call_me \\(\\) at .*foo.adb:$any_nb.*" \ + "decoding of function name" diff --git a/gdb/testsuite/gdb.ada/fun_overload_menu.exp b/gdb/testsuite/gdb.ada/fun_overload_menu.exp index 40f16cf8280..0f8253b2118 100644 --- a/gdb/testsuite/gdb.ada/fun_overload_menu.exp +++ b/gdb/testsuite/gdb.ada/fun_overload_menu.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/fun_renaming.exp b/gdb/testsuite/gdb.ada/fun_renaming.exp index a98b54a152f..4e853dba24c 100644 --- a/gdb/testsuite/gdb.ada/fun_renaming.exp +++ b/gdb/testsuite/gdb.ada/fun_renaming.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile fun_renaming if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/funcall_char.exp b/gdb/testsuite/gdb.ada/funcall_char.exp index d8b9ff79d07..1016bc3fca8 100644 --- a/gdb/testsuite/gdb.ada/funcall_char.exp +++ b/gdb/testsuite/gdb.ada/funcall_char.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/funcall_param.exp b/gdb/testsuite/gdb.ada/funcall_param.exp index 8539a7e28d2..65c99a05390 100644 --- a/gdb/testsuite/gdb.ada/funcall_param.exp +++ b/gdb/testsuite/gdb.ada/funcall_param.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -32,4 +32,4 @@ runto "foo.adb:$bp_location" # class-wide. gdb_test "p ident (ident (my_parameter))" \ - "= \\(one => 1, two => 2, three => 3\\)" "value of ident" + "= \\(one => 1, two => 2, three => 3\\)" "value of ident" diff --git a/gdb/testsuite/gdb.ada/funcall_ptr.exp b/gdb/testsuite/gdb.ada/funcall_ptr.exp index 35b09dfcf3c..f9e377d659a 100644 --- a/gdb/testsuite/gdb.ada/funcall_ptr.exp +++ b/gdb/testsuite/gdb.ada/funcall_ptr.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "$srcfile" "$binfile" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -29,7 +29,7 @@ set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "print pck.ga" " = \\(access integer\\) 0x0" \ - "Check that initial value of GA is null" + "Check that initial value of GA is null" gdb_test_no_output "call pck.p(0x1234)" @@ -39,4 +39,4 @@ gdb_test_no_output "call pck.p(0x1234)" # procedure hence should be 0x1234 after the call above. gdb_test "print pck.ga" " = \\(access integer\\) 0x1234" \ - "Check that value of GA is 0x1234" + "Check that value of GA is 0x1234" diff --git a/gdb/testsuite/gdb.ada/ghost.exp b/gdb/testsuite/gdb.ada/ghost.exp index f3861f766ad..9da7a9ff2a1 100644 --- a/gdb/testsuite/gdb.ada/ghost.exp +++ b/gdb/testsuite/gdb.ada/ghost.exp @@ -21,14 +21,14 @@ standard_ada_testfile main set flags [list debug additional_flags=-gnata] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable $flags] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/main.adb] if {![runto "main.adb:$bp_location"]} { - return + return } gdb_test "print pck.value" " = 64 '@'" diff --git a/gdb/testsuite/gdb.ada/homonym.exp b/gdb/testsuite/gdb.ada/homonym.exp index 416435ab659..b5b64bb3701 100644 --- a/gdb/testsuite/gdb.ada/homonym.exp +++ b/gdb/testsuite/gdb.ada/homonym.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile homonym_main if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -51,24 +51,24 @@ runto "homonym.adb:$bp_location" # sure that the debugger doesn't get mixed up. gdb_test "ptype local_type" \ - "type = range -100 \\.\\. 100" \ - "ptype local_type at BREAK_1" + "type = range -100 \\.\\. 100" \ + "ptype local_type at BREAK_1" gdb_test "ptype local_type_subtype" \ - "type = range -100 \\.\\. 100" \ - "ptype local_type_subtype at BREAK_1" + "type = range -100 \\.\\. 100" \ + "ptype local_type_subtype at BREAK_1" gdb_test "ptype int_type" \ - "type = range -100 \\.\\. 100" \ - "ptype int_type at BREAK_1" + "type = range -100 \\.\\. 100" \ + "ptype int_type at BREAK_1" gdb_test "ptype lcl" \ - "type = range -100 \\.\\. 100" \ - "ptype lcl at BREAK_1" + "type = range -100 \\.\\. 100" \ + "ptype lcl at BREAK_1" gdb_test "print lcl" \ - "= 29" \ - "print lcl at BREAK_1" + "= 29" \ + "print lcl at BREAK_1" # Now, continue until reaching BREAK_2, and do the same commands # as above. The result should be different since the definitions @@ -76,25 +76,25 @@ gdb_test "print lcl" \ set bp_location [gdb_get_line_number "BREAK_2" ${testdir}/homonym.adb] gdb_test "break homonym.adb:$bp_location" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*homonym\\.adb, line \[0-9\]+\\." \ - "break at BREAK_2" + "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*homonym\\.adb, line \[0-9\]+\\." \ + "break at BREAK_2" gdb_test "continue" \ - ".*Breakpoint \[0-9\]+, homonym\\.get_value \\(\\) at .*homonym\\.adb:.*" \ - "continue until BREAK_2" + ".*Breakpoint \[0-9\]+, homonym\\.get_value \\(\\) at .*homonym\\.adb:.*" \ + "continue until BREAK_2" gdb_test "ptype local_type" \ - "type = range 1 \\.\\. 19740804" \ - "ptype local_type at BREAK_2" + "type = range 1 \\.\\. 19740804" \ + "ptype local_type at BREAK_2" gdb_test "ptype local_type_subtype" \ - "type = range 1 \\.\\. 19740804" \ - "ptype local_type_subtype at BREAK_2" + "type = range 1 \\.\\. 19740804" \ + "ptype local_type_subtype at BREAK_2" gdb_test "ptype lcl" \ - "type = range 1 \\.\\. 19740804" \ - "ptype lcl at BREAK_2" + "type = range 1 \\.\\. 19740804" \ + "ptype lcl at BREAK_2" gdb_test "print lcl" \ - "= 17" \ - "print lcl at BREAK_2" + "= 17" \ + "print lcl at BREAK_2" diff --git a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp index 2e4fa3bd885..cff5d378631 100644 --- a/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp +++ b/gdb/testsuite/gdb.ada/info_addr_mixed_case.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } # The following test exercises the situation when uppercase letters diff --git a/gdb/testsuite/gdb.ada/info_auto_lang.exp b/gdb/testsuite/gdb.ada/info_auto_lang.exp index 52418dc95ef..e717802a8d2 100644 --- a/gdb/testsuite/gdb.ada/info_auto_lang.exp +++ b/gdb/testsuite/gdb.ada/info_auto_lang.exp @@ -62,9 +62,9 @@ set func_in_ada(ada_syntax) \ set type_in_c(c_syntax) "${decimal}: typedef struct {\\.\\.\\.} some_type_in_c;" set type_in_c(ada_syntax) [multi_line \ - "${decimal}: record" \ - " some_component_in_c: int;" \ - "end record" ] + "${decimal}: record" \ + " some_component_in_c: int;" \ + "end record" ] set type_in_ada(c_syntax) "${decimal}: struct global_pack__some_type_in_ada" set type_in_ada(ada_syntax) "${decimal}: global_pack.some_type_in_ada" diff --git a/gdb/testsuite/gdb.ada/info_exc.exp b/gdb/testsuite/gdb.ada/info_exc.exp index 3ddeb445600..dd2397cef03 100644 --- a/gdb/testsuite/gdb.ada/info_exc.exp +++ b/gdb/testsuite/gdb.ada/info_exc.exp @@ -20,35 +20,35 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} if {![runto_main]} { - return + return } gdb_test "info exceptions" \ [multi_line "All defined Ada exceptions:" \ - "constraint_error: $hex" \ - "program_error: $hex" \ - "storage_error: $hex" \ - "tasking_error: $hex" \ - ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ] + "constraint_error: $hex" \ + "program_error: $hex" \ + "storage_error: $hex" \ + "tasking_error: $hex" \ + ".*\[\r\n\]*const.aint_global_gdb_e: $hex\[\r\n\]*.*" ] gdb_test "info exceptions task" \ [multi_line "All Ada exceptions matching regular expression \"task\":" \ - "tasking_error: $hex"] + "tasking_error: $hex"] gdb_test "info exceptions global_gdb" \ [multi_line "All Ada exceptions matching regular expression \"global_gdb\":" \ - "const.aint_global_gdb_e: $hex"] + "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_gdb_e: $hex"] + "constraint_error: $hex" \ + "const.aint_global_gdb_e: $hex"] foreach cmd {exception handlers} { gdb_test "complete catch $cmd const.a" \ diff --git a/gdb/testsuite/gdb.ada/info_types.exp b/gdb/testsuite/gdb.ada/info_types.exp index a2e7d255bf9..6dc3d8575cf 100644 --- a/gdb/testsuite/gdb.ada/info_types.exp +++ b/gdb/testsuite/gdb.ada/info_types.exp @@ -29,4 +29,4 @@ gdb_test "set lang ada" "" set eol "\r\n" gdb_test "info types new_integer_type" \ - "All types matching regular expression \"new_integer_type\":${eol}${eol}File .*info_types.c:${eol}.*\tint" + "All types matching regular expression \"new_integer_type\":${eol}${eol}File .*info_types.c:${eol}.*\tint" diff --git a/gdb/testsuite/gdb.ada/int_deref.exp b/gdb/testsuite/gdb.ada/int_deref.exp index 18b1b645ef4..47489ca1c87 100644 --- a/gdb/testsuite/gdb.ada/int_deref.exp +++ b/gdb/testsuite/gdb.ada/int_deref.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -31,10 +31,10 @@ runto "foo.adb:$bp_location" # Hijack a bit this testcase, to verify that name decoding works # when doing symbolic address printing. gdb_test "print watch'address" \ - " = \\(system\\.address\\) $hex " + " = \\(system\\.address\\) $hex " gdb_test "print *long_integer(watch'address)" \ - " = 4874" + " = 4874" gdb_test "print long_integer(watch'address).all" \ - " = 4874" + " = 4874" diff --git a/gdb/testsuite/gdb.ada/interface.exp b/gdb/testsuite/gdb.ada/interface.exp index aa8a6b95fcf..42e9184f9fe 100644 --- a/gdb/testsuite/gdb.ada/interface.exp +++ b/gdb/testsuite/gdb.ada/interface.exp @@ -22,7 +22,7 @@ require gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} @@ -31,10 +31,10 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "print r" \ - "= \\(x => 1, y => 2, w => 3, h => 4\\)" + "= \\(x => 1, y => 2, w => 3, h => 4\\)" gdb_test "print s" \ - "= \\(x => 1, y => 2, w => 3, h => 4\\)" + "= \\(x => 1, y => 2, w => 3, h => 4\\)" set r_re "r = \[^\r\n\]*" set s_re "s = \[^\r\n\]*" diff --git a/gdb/testsuite/gdb.ada/iwide.exp b/gdb/testsuite/gdb.ada/iwide.exp index eaed8506d0c..da6db33fa0b 100644 --- a/gdb/testsuite/gdb.ada/iwide.exp +++ b/gdb/testsuite/gdb.ada/iwide.exp @@ -22,7 +22,7 @@ require gnat_runtime_has_debug_info standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} @@ -52,16 +52,16 @@ gdb_test_multiple "" "Runto to $bp_location" { } gdb_test "print My_Drawable" \ - "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)" + "= \\(center => \\(x => 1, y => 2\\), radius => 3\\)" gdb_test "print s_access.all" \ - "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" gdb_test "print sp_access.all" \ - "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" gdb_test "print d_access.all" \ - "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" gdb_test "print dp_access.all" \ - "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" + "\\(center => \\(x => 1, y => 2\\), radius => 3\\)" diff --git a/gdb/testsuite/gdb.ada/lang_switch.exp b/gdb/testsuite/gdb.ada/lang_switch.exp index 5d73215f957..522447713ab 100644 --- a/gdb/testsuite/gdb.ada/lang_switch.exp +++ b/gdb/testsuite/gdb.ada/lang_switch.exp @@ -24,7 +24,7 @@ set cobject [standard_output_file ${cfile}.o] gdb_compile "${csrcfile}" "${cobject}" object [list debug] if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -37,8 +37,8 @@ gdb_test_no_output "set print frame-arguments all" # Make sure that the language is switched to Ada for the second frame # by checking the string parameter. gdb_test "bt" \ - ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=\"msg\"\\).*" \ - "backtrace" + ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=\"msg\"\\).*" \ + "backtrace" # Now, make sure that the language doesn't get automatically switched # if the current language is not "auto". @@ -47,5 +47,5 @@ gdb_test "set lang c" # -fgnat-encodings=all, but since we don't care so much about the # precise details here, we just accept anything. gdb_test "bt" \ - ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=(@$hex: +)?.*\\).*" \ - "backtrace with lang set to C" + ".*#1.*lang_switch\\.ada_procedure\\s*\\(msg=(@$hex: +)?.*\\).*" \ + "backtrace with lang set to C" diff --git a/gdb/testsuite/gdb.ada/length_cond.exp b/gdb/testsuite/gdb.ada/length_cond.exp index 9020a8abe3c..5cf4fb8eabd 100644 --- a/gdb/testsuite/gdb.ada/length_cond.exp +++ b/gdb/testsuite/gdb.ada/length_cond.exp @@ -23,7 +23,7 @@ require allow_ada_tests standard_ada_testfile length_cond if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/limited-length.exp b/gdb/testsuite/gdb.ada/limited-length.exp index a61172d14bc..c8da4113250 100644 --- a/gdb/testsuite/gdb.ada/limited-length.exp +++ b/gdb/testsuite/gdb.ada/limited-length.exp @@ -20,8 +20,8 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable \ - [list debug ]] != "" } { - return + [list debug ]] != "" } { + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/local-enum.exp b/gdb/testsuite/gdb.ada/local-enum.exp index 54d318d8974..b1f9b95c9d7 100644 --- a/gdb/testsuite/gdb.ada/local-enum.exp +++ b/gdb/testsuite/gdb.ada/local-enum.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile local if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/local.adb] if {![runto "local.adb:$bp_location"]} { - return + return } # The test has two constants named 'three', with different values. diff --git a/gdb/testsuite/gdb.ada/maint_with_ada.exp b/gdb/testsuite/gdb.ada/maint_with_ada.exp index 320ef5bf7cb..796b7ff2659 100644 --- a/gdb/testsuite/gdb.ada/maint_with_ada.exp +++ b/gdb/testsuite/gdb.ada/maint_with_ada.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile var_arr_typedef if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/mi_catch_assert.exp b/gdb/testsuite/gdb.ada/mi_catch_assert.exp index 12181cf90a0..b128513226d 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_assert.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_assert.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile bla if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } load_lib mi-support.exp @@ -39,19 +39,19 @@ mi_clean_restart $::testfile # - continue, the program exits. if {[mi_runto_main] < 0} { - return + return } mi_gdb_test "-catch-assert -c \"Global_Var = 2\"" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*,cond=\"Global_Var = 2\",.*}" \ - "catch assert failures with condition" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*,cond=\"Global_Var = 2\",.*}" \ + "catch assert failures with condition" set bp_location [gdb_get_line_number "STOP" ${testdir}/bla.adb] mi_execute_to "exec-continue" \ - "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\"" \ - "bla" "" ".*" "$bp_location" \ - ".*" \ - "continue to assert failure catchpoint hit" + "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\"" \ + "bla" "" ".*" "$bp_location" \ + ".*" \ + "continue to assert failure catchpoint hit" # Exit the inferior. mi_send_resuming_command "exec-continue" "continuing to inferior exit" diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex.exp b/gdb/testsuite/gdb.ada/mi_catch_ex.exp index 00d2897271a..889cc1c2d82 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } # A global variable used to simplify the maintenance of some of @@ -43,8 +43,8 @@ with_test_prefix "scenario 1" { } mi_gdb_test "-catch-exception" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions\",.*}" \ - "catch all exceptions" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions\",.*}" \ + "catch all exceptions" # Continue to caught exception. @@ -101,31 +101,31 @@ with_test_prefix "scenario 2" { } mi_gdb_test "-catch-exception -e Program_Error" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Program_Error' Ada exception\",.*}" \ - "catch Program_Error" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Program_Error' Ada exception\",.*}" \ + "catch Program_Error" mi_gdb_test "-catch-assert" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*}" \ - "catch assert failures" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"failed Ada assertions\",.*}" \ + "catch assert failures" mi_gdb_test "-catch-exception -u" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"unhandled Ada exceptions\",.*}" \ - "catch unhandled exceptions" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"unhandled Ada exceptions\",.*}" \ + "catch unhandled exceptions" mi_execute_to "exec-continue" \ - "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"PROGRAM_ERROR(\",exception-message=\"foo\\.adb:$decimal explicit raise)?\"" \ - "foo" "" ".*" ".*" \ - ".*" \ - "continue to exception catchpoint hit" + "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"PROGRAM_ERROR(\",exception-message=\"foo\\.adb:$decimal explicit raise)?\"" \ + "foo" "" ".*" ".*" \ + ".*" \ + "continue to exception catchpoint hit" mi_execute_to "exec-continue" \ - "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\"" \ - "foo" "" ".*" ".*" \ - ".*" \ - "continue to assert failure catchpoint hit" + "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\"" \ + "foo" "" ".*" ".*" \ + ".*" \ + "continue to assert failure catchpoint hit" mi_execute_to "exec-continue" \ - "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR\"" \ - "foo" "" ".*" ".*" \ - ".*" \ - "continue to unhandled exception catchpoint hit" + "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$any_nb\",exception-name=\"CONSTRAINT_ERROR\"" \ + "foo" "" ".*" ".*" \ + ".*" \ + "continue to unhandled exception catchpoint hit" diff --git a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp index a1fb6ac3704..bb1113c3b8e 100644 --- a/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp +++ b/gdb/testsuite/gdb.ada/mi_catch_ex_hand.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } load_lib mi-support.exp @@ -39,8 +39,8 @@ with_test_prefix "scenario 1" { } mi_gdb_test "-catch-handlers" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions handlers\",.*}" \ - "catch all exceptions handlers" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"all Ada exceptions handlers\",.*}" \ + "catch all exceptions handlers" # Continue to exception handler. @@ -91,14 +91,14 @@ with_test_prefix "scenario 2" { } mi_gdb_test "-catch-handlers -e Constraint_Error" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Constraint_Error' Ada exception handlers\",.*}" \ - "catch Constraint_Error" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`Constraint_Error' Ada exception handlers\",.*}" \ + "catch Constraint_Error" mi_execute_to "exec-continue" \ - "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\",exception-name=\"exception\"" \ - "foo" "" ".*" "$bp_ce_location" \ - ".*" \ - "continue to exception catchpoint hit" + "\"breakpoint-hit\",disp=\"keep\",bkptno=\"$decimal\",exception-name=\"exception\"" \ + "foo" "" ".*" "$bp_ce_location" \ + ".*" \ + "continue to exception catchpoint hit" # Exit the inferior. mi_send_resuming_command "exec-continue" "continuing to inferior exit" diff --git a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp index c40fee5f05a..e10a7998d4c 100644 --- a/gdb/testsuite/gdb.ada/mi_dyn_arr.exp +++ b/gdb/testsuite/gdb.ada/mi_dyn_arr.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } load_lib mi-support.exp @@ -29,7 +29,7 @@ set MIFLAGS "-i=mi" mi_clean_restart $::testfile if {[mi_runto_main] < 0} { - return + return } set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] diff --git a/gdb/testsuite/gdb.ada/mi_ex_cond.exp b/gdb/testsuite/gdb.ada/mi_ex_cond.exp index 88516e8ec16..7567723ce5e 100644 --- a/gdb/testsuite/gdb.ada/mi_ex_cond.exp +++ b/gdb/testsuite/gdb.ada/mi_ex_cond.exp @@ -20,7 +20,7 @@ require allow_ada_tests gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-static additional_flags=-margs ]] != "" } { - return + return } # A global variable used to simplify the maintenance of some of @@ -38,8 +38,8 @@ if {[mi_clean_restart $::testfile]} { # catchpoint that uses both conditions and exception name. mi_gdb_test "-catch-exception -c \"i = 2\" -e constraint_error" \ - "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*}" \ - "catch C_E if i = 2" + "\\^done,bkptno=\"$decimal\",bkpt={.*disp=\"keep\",enabled=\"y\",what=\"`constraint_error' Ada exception\",.*,cond=\"i = 2\",.*}" \ + "catch C_E if i = 2" # It is important that we start the program's execution after having # inserted the exception catchpoint above. We want to verify that diff --git a/gdb/testsuite/gdb.ada/mi_exc_info.exp b/gdb/testsuite/gdb.ada/mi_exc_info.exp index 777cbb629d5..2874e8d7dde 100644 --- a/gdb/testsuite/gdb.ada/mi_exc_info.exp +++ b/gdb/testsuite/gdb.ada/mi_exc_info.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } load_lib mi-support.exp @@ -29,7 +29,7 @@ set MIFLAGS "-i=mi" mi_clean_restart $::testfile if {[mi_runto_main] < 0} { - return + return } mi_delete_breakpoints @@ -37,17 +37,17 @@ 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_gdb_e\",address=\"$hex\"}.*\\\]}" \ - "-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_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" + "\\^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_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" + "\\^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_gdb_e\",address=\"$hex\"}\\\]}" \ - "-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_gdb_e\",address=\"$hex\"}\\\]}" \ + "-info-ada-exceptions const.aint" diff --git a/gdb/testsuite/gdb.ada/mi_interface.exp b/gdb/testsuite/gdb.ada/mi_interface.exp index c26d794ac2b..8d377965edf 100644 --- a/gdb/testsuite/gdb.ada/mi_interface.exp +++ b/gdb/testsuite/gdb.ada/mi_interface.exp @@ -22,7 +22,7 @@ require gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat12 ]] != "" } { - return + return } load_lib mi-support.exp @@ -31,7 +31,7 @@ set MIFLAGS "-i=mi" mi_clean_restart $::testfile if {[mi_runto_main] < 0} { - return + return } set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb] diff --git a/gdb/testsuite/gdb.ada/mi_prot.exp b/gdb/testsuite/gdb.ada/mi_prot.exp index ed5dcf3fecf..6fa38a9ad55 100644 --- a/gdb/testsuite/gdb.ada/mi_prot.exp +++ b/gdb/testsuite/gdb.ada/mi_prot.exp @@ -31,7 +31,7 @@ set MIFLAGS "-i=mi" mi_clean_restart $::testfile if {[mi_runto_main] < 0} { - return + return } mi_delete_breakpoints diff --git a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp index 6af6fd76eb7..228123c9773 100644 --- a/gdb/testsuite/gdb.ada/mi_ref_changeable.exp +++ b/gdb/testsuite/gdb.ada/mi_ref_changeable.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_rb20_056 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } load_lib mi-support.exp @@ -29,7 +29,7 @@ set MIFLAGS "-i=mi" mi_clean_restart $::testfile if {[mi_runto_main] < 0} { - return + return } # Continue until STOP_1, and create a varobj for variables "A" and "B". diff --git a/gdb/testsuite/gdb.ada/mi_task_arg.exp b/gdb/testsuite/gdb.ada/mi_task_arg.exp index ab0dca2f2c1..52eef8484ac 100644 --- a/gdb/testsuite/gdb.ada/mi_task_arg.exp +++ b/gdb/testsuite/gdb.ada/mi_task_arg.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile task_switch if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } load_lib mi-support.exp @@ -34,7 +34,7 @@ if {[mi_clean_restart $::testfile]} { mi_gdb_test "-gdb-set debug-file-directory \"\"" ".*" if {![mi_runto "task_switch.break_me"]} { - return + return } # Verify that "-stack-list-arguments" does not cause the debugger to diff --git a/gdb/testsuite/gdb.ada/mi_task_info.exp b/gdb/testsuite/gdb.ada/mi_task_info.exp index 757df384b48..9c53cbc2256 100644 --- a/gdb/testsuite/gdb.ada/mi_task_info.exp +++ b/gdb/testsuite/gdb.ada/mi_task_info.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile task_switch if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnata ]] != "" } { - return + return } load_lib mi-support.exp @@ -35,24 +35,24 @@ if {[mi_clean_restart $::testfile]} { #################################### if {![mi_runto "task_switch.break_me"]} { - return + return } set ada_task_info_hdr \ - "hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"current\",colhdr=\"\"},{width=\"3\",alignment=\"1\",col_name=\"id\",colhdr=\"ID\"},{width=\"9\",alignment=\"1\",col_name=\"task-id\",colhdr=\"TID\"},{width=\"4\",alignment=\"1\",col_name=\"thread-id\",colhdr=\"\"},{width=\"4\",alignment=\"1\",col_name=\"parent-id\",colhdr=\"P-ID\"},{width=\"3\",alignment=\"1\",col_name=\"priority\",colhdr=\"Pri\"},{width=\"22\",alignment=\"-1\",col_name=\"state\",colhdr=\"State\"},{width=\"1\",alignment=\"2\",col_name=\"name\",colhdr=\"Name\"}\\\]" + "hdr=\\\[{width=\"1\",alignment=\"-1\",col_name=\"current\",colhdr=\"\"},{width=\"3\",alignment=\"1\",col_name=\"id\",colhdr=\"ID\"},{width=\"9\",alignment=\"1\",col_name=\"task-id\",colhdr=\"TID\"},{width=\"4\",alignment=\"1\",col_name=\"thread-id\",colhdr=\"\"},{width=\"4\",alignment=\"1\",col_name=\"parent-id\",colhdr=\"P-ID\"},{width=\"3\",alignment=\"1\",col_name=\"priority\",colhdr=\"Pri\"},{width=\"22\",alignment=\"-1\",col_name=\"state\",colhdr=\"State\"},{width=\"1\",alignment=\"2\",col_name=\"name\",colhdr=\"Name\"}\\\]" set task_1 \ - "{id=\"1\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",priority=\"\[0-9\]+\",state=\"(Child (Activation|Termination) Wait|Runnable)\",name=\"main_task\"}" + "{id=\"1\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",priority=\"\[0-9\]+\",state=\"(Child (Activation|Termination) Wait|Runnable)\",name=\"main_task\"}" set task_2 \ - "{id=\"2\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"(Accept or Select Term|Runnable)\",name=\"my_callee\"}" + "{id=\"2\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"(Accept or Select Term|Runnable)\",name=\"my_callee\"}" set task_3 \ - "{current=\"\\*\",id=\"3\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"Runnable\",name=\"my_caller\"}" + "{current=\"\\*\",id=\"3\",task-id=\" *(0x)?\[0-9a-fA-F\]+\",thread-id=\"\[0-9\]+\",parent-id=\"1\",priority=\"\[0-9\]+\",state=\"Runnable\",name=\"my_caller\"}" # Get the full list of tasks... mi_gdb_test "-ada-task-info" \ - ".*\\^done,tasks={nr_rows=\"3\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_1,$task_2,$task_3\\\]}" \ - "-ada-task-info with no argument" + ".*\\^done,tasks={nr_rows=\"3\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_1,$task_2,$task_3\\\]}" \ + "-ada-task-info with no argument" # Now, only get the info about task 3. mi_gdb_test "-ada-task-info 3" \ - "\\^done,tasks={nr_rows=\"1\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_3\\\]}" \ - "-ada-task-info 3" + "\\^done,tasks={nr_rows=\"1\",nr_cols=\"8\",$ada_task_info_hdr,body=\\\[$task_3\\\]}" \ + "-ada-task-info 3" diff --git a/gdb/testsuite/gdb.ada/minsyms.exp b/gdb/testsuite/gdb.ada/minsyms.exp index 6f354b32710..1eb5fa6c4eb 100644 --- a/gdb/testsuite/gdb.ada/minsyms.exp +++ b/gdb/testsuite/gdb.ada/minsyms.exp @@ -20,25 +20,25 @@ require allow_ada_tests standard_ada_testfile foo_qb07_057 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable ""] != "" } { - return + return } clean_restart ${testfile} if {![runto "_ada_foo_qb07_057"]} { - return + return } gdb_test_no_output "set language ada" gdb_test "print some_minsym" \ - "'some_minsym' has unknown type; cast it to its declared type" + "'some_minsym' has unknown type; cast it to its declared type" gdb_test "print integer(some_minsym)" \ - " = 1234" + " = 1234" gdb_test "print &some_minsym" \ - " = \\(access \\) $hex " + " = \\(access \\) $hex " gdb_test "print /x integer(&some_minsym)" \ - " = $hex" + " = $hex" diff --git a/gdb/testsuite/gdb.ada/n_arr_bound.exp b/gdb/testsuite/gdb.ada/n_arr_bound.exp index 7ef01806d6e..aae9d279bcd 100644 --- a/gdb/testsuite/gdb.ada/n_arr_bound.exp +++ b/gdb/testsuite/gdb.ada/n_arr_bound.exp @@ -29,4 +29,4 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "ptype var" \ - "= array \\(0 .. -1\\) of integer" + "= array \\(0 .. -1\\) of integer" diff --git a/gdb/testsuite/gdb.ada/nested.exp b/gdb/testsuite/gdb.ada/nested.exp index 1638bef7c2d..f65e5d63a72 100644 --- a/gdb/testsuite/gdb.ada/nested.exp +++ b/gdb/testsuite/gdb.ada/nested.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile hello if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -31,8 +31,8 @@ set any_addr "0x\[0-9a-zA-Z\]+" # Try breaking on a nested function. gdb_test "break first" \ - "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \ - "break on nested function First" + "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \ + "break on nested function First" gdb_test "break fourth" \ "Breakpoint $any_nb at $any_addr: file .*hello.adb, line $any_nb." \ diff --git a/gdb/testsuite/gdb.ada/notcplusplus.exp b/gdb/testsuite/gdb.ada/notcplusplus.exp index a951d9a9ca2..1c1790c4459 100644 --- a/gdb/testsuite/gdb.ada/notcplusplus.exp +++ b/gdb/testsuite/gdb.ada/notcplusplus.exp @@ -26,20 +26,20 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { clean_restart ${testfile} gdb_test "print /x " \ - "= \\(a => 0x60287af\\)" \ - "print before loading symbols from ver.ads" + "= \\(a => 0x60287af\\)" \ + "print before loading symbols from ver.ads" # Force the partial symbosl from ver.ads to be expanded into full symbols. gdb_test \ - "list ver.ads:16" \ - [multi_line ".*" \ - "16\\s+package Ver is" \ - "17\\s+type Wrapper is record" \ - "18\\s+A : Integer;" \ - "19\\s+end record;" \ - "20\\s+u00045 : constant Wrapper := \\(A => 16#060287af#\\);"] + "list ver.ads:16" \ + [multi_line ".*" \ + "16\\s+package Ver is" \ + "17\\s+type Wrapper is record" \ + "18\\s+A : Integer;" \ + "19\\s+end record;" \ + "20\\s+u00045 : constant Wrapper := \\(A => 16#060287af#\\);"] gdb_test "print /x " \ - "= \\(a => 0x60287af\\)" \ - "print after loading symbols from ver.ads" + "= \\(a => 0x60287af\\)" \ + "print after loading symbols from ver.ads" diff --git a/gdb/testsuite/gdb.ada/null_array.exp b/gdb/testsuite/gdb.ada/null_array.exp index 16131c01af0..871066f5820 100644 --- a/gdb/testsuite/gdb.ada/null_array.exp +++ b/gdb/testsuite/gdb.ada/null_array.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -33,10 +33,10 @@ if {[gnat_version_compare <= {4 4}]} { setup_xfail *-*-* } gdb_test "print my_table" \ - "= \\(\\)" + "= \\(\\)" gdb_test "ptype my_table" \ - "type = array \\(10 \\.\\. 1\\) of integer" + "type = array \\(10 \\.\\. 1\\) of integer" gdb_test "print my_matrix" \ - "= \\(m => \\((\"\", ){9}\"\"\\)\\)" + "= \\(m => \\((\"\", ){9}\"\"\\)\\)" diff --git a/gdb/testsuite/gdb.ada/null_record.exp b/gdb/testsuite/gdb.ada/null_record.exp index 64ac2df8b5e..f6d307d74cd 100644 --- a/gdb/testsuite/gdb.ada/null_record.exp +++ b/gdb/testsuite/gdb.ada/null_record.exp @@ -29,5 +29,5 @@ set bp_location [gdb_get_line_number "START" ${testdir}/null_record.adb] runto "null_record.adb:$bp_location" gdb_test "ptype empty" \ - "type = record null; end record" \ - "ptype on null record" + "type = record null; end record" \ + "ptype on null record" diff --git a/gdb/testsuite/gdb.ada/operator_bp.exp b/gdb/testsuite/gdb.ada/operator_bp.exp index bd545c25be7..562bfd5ea8f 100644 --- a/gdb/testsuite/gdb.ada/operator_bp.exp +++ b/gdb/testsuite/gdb.ada/operator_bp.exp @@ -56,8 +56,8 @@ foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" foreach op { "+" "-" "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} { set op_re [string_to_regexp $op] gdb_test "continue" \ - "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\ - "continue to \"$op\"" + "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\ + "continue to \"$op\"" } # Perform the same test, but using the qualified name of the operator, @@ -72,13 +72,13 @@ runto "ops_test.adb:$bp_location" foreach op { "+" "-" } { set op_re [string_to_regexp $op] gdb_test "break ops.\"$op\"" \ - "Breakpoint $decimal at $hex: ops\\.\"$op_re\"\\. \\(2 locations\\)" + "Breakpoint $decimal at $hex: ops\\.\"$op_re\"\\. \\(2 locations\\)" } foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} { set op_re [string_to_regexp $op] gdb_test "break ops.\"$op\"" \ - "Breakpoint $decimal at $hex: file .*ops.adb, line $decimal." + "Breakpoint $decimal at $hex: file .*ops.adb, line $decimal." } # Make sure we stop correctly in each operator function. @@ -86,6 +86,6 @@ foreach op { "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" foreach op { "+" "-" "*" "/" "mod" "rem" "**" "<" "<=" ">" ">=" "=" "and" "or" "xor" "&" "abs" "not"} { set op_re [string_to_regexp $op] gdb_test "continue" \ - "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\ - "continue to ops.\"$op\"" + "Breakpoint $bkptno_numopt_re, ops\\.\"$op_re\" .*"\ + "continue to ops.\"$op\"" } diff --git a/gdb/testsuite/gdb.ada/optim_drec.exp b/gdb/testsuite/gdb.ada/optim_drec.exp index 19bb463ebeb..2f5862e385c 100644 --- a/gdb/testsuite/gdb.ada/optim_drec.exp +++ b/gdb/testsuite/gdb.ada/optim_drec.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} if {![runto "foo"]} { - return + return } gdb_test "print z" \ - "= (\\(a => .*, b => .*, c => .*\\)|)" + "= (\\(a => .*, b => .*, c => .*\\)|)" diff --git a/gdb/testsuite/gdb.ada/packed_array_assign.exp b/gdb/testsuite/gdb.ada/packed_array_assign.exp index 36ed1d29544..491af6320be 100644 --- a/gdb/testsuite/gdb.ada/packed_array_assign.exp +++ b/gdb/testsuite/gdb.ada/packed_array_assign.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile tester if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/pckd_neg.exp b/gdb/testsuite/gdb.ada/pckd_neg.exp index 5c5e1330b19..81cb093fb3c 100644 --- a/gdb/testsuite/gdb.ada/pckd_neg.exp +++ b/gdb/testsuite/gdb.ada/pckd_neg.exp @@ -29,16 +29,16 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_o508_021.adb] runto "foo_o508_021.adb:$bp_location" gdb_test "print SSA" \ - "= \\(-1, 2, -3, 4\\)" + "= \\(-1, 2, -3, 4\\)" gdb_test "print SSA(1)" \ - "= -1" + "= -1" gdb_test "print SSA(2)" \ - "= 2" + "= 2" gdb_test "print SSA(3)" \ - "= -3" + "= -3" gdb_test "print SSA(4)" \ - "= 4" + "= 4" diff --git a/gdb/testsuite/gdb.ada/pkd_arr_elem.exp b/gdb/testsuite/gdb.ada/pkd_arr_elem.exp index 3b88c1e1e67..b1bd8cfd5b4 100644 --- a/gdb/testsuite/gdb.ada/pkd_arr_elem.exp +++ b/gdb/testsuite/gdb.ada/pkd_arr_elem.exp @@ -55,16 +55,16 @@ gdb_test_multiple "" "Runto to $bp_location" { # of the components. Accept both known orders. set test "print test" gdb_test_multiple "$test" $test { - -re "= \\(size => 100, length => 1, str => \\(33 'A', nul \\)\\).*$gdb_prompt $" { - pass $test + -re "= \\(size => 100, length => 1, str => \\(33 'A', nul \\)\\).*$gdb_prompt $" { + pass $test } - -re "= \\(size => 100, str => \\(33 'A', nul \\), length => 1\\).*$gdb_prompt $" { - pass $test + -re "= \\(size => 100, str => \\(33 'A', nul \\), length => 1\\).*$gdb_prompt $" { + pass $test } } gdb_test "print test.str" \ - "= \\(33 'A', nul \\)" + "= \\(33 'A', nul \\)" gdb_test "print test.str(1)" \ - "= 33 'A'" + "= 33 'A'" diff --git a/gdb/testsuite/gdb.ada/pp-rec-component.exp b/gdb/testsuite/gdb.ada/pp-rec-component.exp index 8db2d5f891f..39eec3098b5 100644 --- a/gdb/testsuite/gdb.ada/pp-rec-component.exp +++ b/gdb/testsuite/gdb.ada/pp-rec-component.exp @@ -20,7 +20,7 @@ require allow_ada_tests allow_python_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -34,7 +34,7 @@ set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "print before" \ - " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)" + " = Thu Nov 14 02:22:23 2013 \\(1384395743\\)" gdb_test "print /r before" \ - " = \\(secs => 1384395743\\)" + " = \\(secs => 1384395743\\)" diff --git a/gdb/testsuite/gdb.ada/print_chars.exp b/gdb/testsuite/gdb.ada/print_chars.exp index f87c85b1046..cefc6bcbc87 100644 --- a/gdb/testsuite/gdb.ada/print_chars.exp +++ b/gdb/testsuite/gdb.ada/print_chars.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} @@ -30,12 +30,12 @@ runto "foo.adb:$bp_location" gdb_test "print C" \ - "= 97 'a'" + "= 97 'a'" gdb_test "print WC" \ - "= 98 'b'" + "= 98 'b'" gdb_test "print WWC" \ - "= 99 'c'" + "= 99 'c'" gdb_test "print MC" " = 77 'M'" diff --git a/gdb/testsuite/gdb.ada/print_pc.exp b/gdb/testsuite/gdb.ada/print_pc.exp index 212e9e62211..ceea2b283cd 100644 --- a/gdb/testsuite/gdb.ada/print_pc.exp +++ b/gdb/testsuite/gdb.ada/print_pc.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile dummy start if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -29,4 +29,4 @@ set bp_location [gdb_get_line_number "START" ${testdir}/dummy.adb] runto "dummy.adb:$bp_location" gdb_test "p /x \$pc" \ - "= 0x\[0-9a-zA-Z\]+" + "= 0x\[0-9a-zA-Z\]+" diff --git a/gdb/testsuite/gdb.ada/ptr_typedef.exp b/gdb/testsuite/gdb.ada/ptr_typedef.exp index 5d0b1c9df32..ede4003f31d 100644 --- a/gdb/testsuite/gdb.ada/ptr_typedef.exp +++ b/gdb/testsuite/gdb.ada/ptr_typedef.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp index 0b485bb04c6..686afb64478 100644 --- a/gdb/testsuite/gdb.ada/ptype_arith_binop.exp +++ b/gdb/testsuite/gdb.ada/ptype_arith_binop.exp @@ -18,10 +18,10 @@ require allow_ada_tests clean_restart gdb_test_no_output "set lang ada" \ - "set lang ada" + "set lang ada" gdb_test "ptype 3 * 2.0" \ - "= <\[0-9\]+-byte float>" + "= <\[0-9\]+-byte float>" gdb_test "ptype 3 / 2.0" \ - "= <\[0-9\]+-byte float>" + "= <\[0-9\]+-byte float>" diff --git a/gdb/testsuite/gdb.ada/ptype_array.exp b/gdb/testsuite/gdb.ada/ptype_array.exp index 1c0f2aabcc5..ad38794cceb 100644 --- a/gdb/testsuite/gdb.ada/ptype_array.exp +++ b/gdb/testsuite/gdb.ada/ptype_array.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/ptype_field.exp b/gdb/testsuite/gdb.ada/ptype_field.exp index abaf6f00409..0cf089a752e 100644 --- a/gdb/testsuite/gdb.ada/ptype_field.exp +++ b/gdb/testsuite/gdb.ada/ptype_field.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-gnat05 ]] != "" } { - return + return } clean_restart ${testfile} @@ -29,19 +29,19 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "ptype circle" \ - [multi_line "type = record" \ - " pos: pck\\.position;" \ - " radius: integer;" \ - "end record" ] + [multi_line "type = record" \ + " pos: pck\\.position;" \ + " radius: integer;" \ + "end record" ] gdb_test "ptype circle.pos" \ - [multi_line "type = record" \ - " x: integer;" \ - " y: integer;" \ - "end record" ] + [multi_line "type = record" \ + " x: integer;" \ + " y: integer;" \ + "end record" ] gdb_test "ptype circle.pos.x" \ - "type = <\[0-9\]+-byte integer>" + "type = <\[0-9\]+-byte integer>" gdb_test "complete print my_circ" "print my_circle" gdb_test "complete print my_circle.r" "print my_circle\\.radius" @@ -65,9 +65,9 @@ gdb_test "complete ptype pck.c" "ptype pck\\.circle" # We can't query the members of a package yet, and this yields a bit # too much output, so comment out for now instead of kfailing. # gdb_test "complete ptype pck." \ -# [multi_line \ -# "ptype pck\\.circle" \ -# "ptype pck\\.position"] + # [multi_line \ + # "ptype pck\\.circle" \ + # "ptype pck\\.position"] gdb_test "complete ptype circle.pos." \ [multi_line \ diff --git a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp index 5389f7981fb..347187bef22 100644 --- a/gdb/testsuite/gdb.ada/ptype_tagged_param.exp +++ b/gdb/testsuite/gdb.ada/ptype_tagged_param.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } set has_runtime_debug_info [gnat_runtime_has_debug_info] @@ -28,7 +28,7 @@ set has_runtime_debug_info [gnat_runtime_has_debug_info] clean_restart ${testfile} if {![runto "pck.adb:20"]} { - return + return } # With some versions of the compiler, identifying the runtime type of diff --git a/gdb/testsuite/gdb.ada/py_range.exp b/gdb/testsuite/gdb.ada/py_range.exp index 426fba0d673..92864e8cd6e 100644 --- a/gdb/testsuite/gdb.ada/py_range.exp +++ b/gdb/testsuite/gdb.ada/py_range.exp @@ -21,7 +21,7 @@ require allow_ada_tests allow_python_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -30,13 +30,13 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] runto "foo.adb:$bp_location" gdb_test "python print(int(gdb.parse_and_eval('sr')))" \ - "48" + "48" gdb_test "python print(int(gdb.parse_and_eval('si')))" \ - "740804" + "740804" gdb_test "python print(int(gdb.parse_and_eval('ir')))" \ - "974" + "974" # Accept "foo." prefix for older versions of GNAT. gdb_test "python print(gdb.parse_and_eval('si').type)" \ diff --git a/gdb/testsuite/gdb.ada/rdv_wait.exp b/gdb/testsuite/gdb.ada/rdv_wait.exp index c585952e490..3bfd503e9e1 100644 --- a/gdb/testsuite/gdb.ada/rdv_wait.exp +++ b/gdb/testsuite/gdb.ada/rdv_wait.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -33,8 +33,8 @@ runto "break_me" # Switch to task 2, and verify that GDB is able to unwind all the way # to foo.T. gdb_test "task 2" \ - [join {"\\\[Switching to task 2 \"mit\"\\\].*" \ - ".*foo\\.t \\(.*\\).*foo\\.adb:.*"} ""] + [join {"\\\[Switching to task 2 \"mit\"\\\].*" \ + ".*foo\\.t \\(.*\\).*foo\\.adb:.*"} ""] gdb_test "task apply 1 -q frame" ".*pck\\.break_me.*" diff --git a/gdb/testsuite/gdb.ada/rec_comp.exp b/gdb/testsuite/gdb.ada/rec_comp.exp index 7e94e201905..5d925695965 100644 --- a/gdb/testsuite/gdb.ada/rec_comp.exp +++ b/gdb/testsuite/gdb.ada/rec_comp.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile bar_o203_012 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/bar_o203_012.adb] if {![runto "bar_o203_012.adb:$bp_location"]} { - return + return } # Accept "bar_o203_012." prefix for older versions of GNAT. diff --git a/gdb/testsuite/gdb.ada/rec_return.exp b/gdb/testsuite/gdb.ada/rec_return.exp index 56fb0b9f9fe..5ee1be34f46 100644 --- a/gdb/testsuite/gdb.ada/rec_return.exp +++ b/gdb/testsuite/gdb.ada/rec_return.exp @@ -20,15 +20,15 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } gdb_test "print bar" \ - "= \\(x => 42, s => \"ABCDEFGH\"\\)" + "= \\(x => 42, s => \"ABCDEFGH\"\\)" diff --git a/gdb/testsuite/gdb.ada/ref_param.exp b/gdb/testsuite/gdb.ada/ref_param.exp index 27197e62f92..f207a0b127c 100644 --- a/gdb/testsuite/gdb.ada/ref_param.exp +++ b/gdb/testsuite/gdb.ada/ref_param.exp @@ -20,18 +20,18 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} if {![runto pck.adb:20]} { - return + return } gdb_test_no_output "set print frame-arguments all" set expected_d "\\(one => 1, two => 2, three => 3, four => 4, five => 5, six => 6\\)" gdb_test "frame" \ - "#0\[ \t\]*pck\\.call_me \\(d=${expected_d}\\).*" \ - "frame argument value printed" + "#0\[ \t\]*pck\\.call_me \\(d=${expected_d}\\).*" \ + "frame argument value printed" diff --git a/gdb/testsuite/gdb.ada/ref_tick_size.exp b/gdb/testsuite/gdb.ada/ref_tick_size.exp index b62b9f19a55..6ab00772b25 100644 --- a/gdb/testsuite/gdb.ada/ref_tick_size.exp +++ b/gdb/testsuite/gdb.ada/ref_tick_size.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -34,4 +34,4 @@ runto "p.adb:$bp_location" # the size of d1. gdb_test "print d1'size = d2'size" \ - "= true" + "= true" diff --git a/gdb/testsuite/gdb.ada/rename_subscript_param.exp b/gdb/testsuite/gdb.ada/rename_subscript_param.exp index 5ec9b2a04c7..0a9b7eaaf98 100644 --- a/gdb/testsuite/gdb.ada/rename_subscript_param.exp +++ b/gdb/testsuite/gdb.ada/rename_subscript_param.exp @@ -22,7 +22,7 @@ require {gnat_version_compare >= 8} standard_ada_testfile pb30_012 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -31,18 +31,18 @@ set bp_location [gdb_get_line_number "BREAK" ${testdir}/pkg.adb] runto "pkg.adb:$bp_location" gdb_test "print rename_subscript_param_b" \ - " = false" \ - "print rename_subscript_param_b before changing its value" + " = false" \ + "print rename_subscript_param_b before changing its value" set bp_location [gdb_get_line_number "Do_Nothing" ${testdir}/pkg.adb] gdb_test "break pkg.adb:$bp_location" \ - "Breakpoint \[0-9\]+ at.*: file .*pkg.adb, line \[0-9\]+." \ - "insert second breakpoint in pkg.adb" + "Breakpoint \[0-9\]+ at.*: file .*pkg.adb, line \[0-9\]+." \ + "insert second breakpoint in pkg.adb" gdb_test "cont" \ - "Breakpoint \[0-9\]+, pkg.flip \\(.*" \ - "Continuing to breakpoint on call to Do_Nothing" + "Breakpoint \[0-9\]+, pkg.flip \\(.*" \ + "Continuing to breakpoint on call to Do_Nothing" gdb_test "print rename_subscript_param_b" \ - " = true" \ - "print rename_subscript_param_b after changing its value" + " = true" \ + "print rename_subscript_param_b after changing its value" diff --git a/gdb/testsuite/gdb.ada/repeat_dyn.exp b/gdb/testsuite/gdb.ada/repeat_dyn.exp index 3cece3aa493..f0ea4d5298a 100644 --- a/gdb/testsuite/gdb.ada/repeat_dyn.exp +++ b/gdb/testsuite/gdb.ada/repeat_dyn.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_oc22_002 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -29,4 +29,4 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_oc22_002.adb] runto "foo_oc22_002.adb:$bp_location" gdb_test "print a1(1)@3" \ - " = \\(3, 5, 8\\)" + " = \\(3, 5, 8\\)" diff --git a/gdb/testsuite/gdb.ada/return-small-char-array.exp b/gdb/testsuite/gdb.ada/return-small-char-array.exp index b8652ac2afb..a7777736d26 100644 --- a/gdb/testsuite/gdb.ada/return-small-char-array.exp +++ b/gdb/testsuite/gdb.ada/return-small-char-array.exp @@ -26,7 +26,7 @@ if { [ada_fvar_tracking] } { } if { [gdb_compile_ada $srcfile $binfile executable $opts] != "" } { - return + return } clean_restart $testfile diff --git a/gdb/testsuite/gdb.ada/same_enum.exp b/gdb/testsuite/gdb.ada/same_enum.exp index fc75c215e67..c76f9610c02 100644 --- a/gdb/testsuite/gdb.ada/same_enum.exp +++ b/gdb/testsuite/gdb.ada/same_enum.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile a if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/scalar_storage.exp b/gdb/testsuite/gdb.ada/scalar_storage.exp index f6504a75cf2..212caa1c0fa 100644 --- a/gdb/testsuite/gdb.ada/scalar_storage.exp +++ b/gdb/testsuite/gdb.ada/scalar_storage.exp @@ -42,7 +42,7 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/storage.adb] if {![runto "storage.adb:$bp_location"]} { - return + return } set re "value => 126, another_value => 12, color => green" diff --git a/gdb/testsuite/gdb.ada/scoped_watch.exp b/gdb/testsuite/gdb.ada/scoped_watch.exp index 88f2478d7e2..8ba41d5c868 100644 --- a/gdb/testsuite/gdb.ada/scoped_watch.exp +++ b/gdb/testsuite/gdb.ada/scoped_watch.exp @@ -31,27 +31,27 @@ runto "pck.adb:$bp_location" # Insert a watchpoint on local variable "result" gdb_test "watch result" \ - ".*atchpoint \[0-9\]+: result" + ".*atchpoint \[0-9\]+: result" # Insert a breakpoint we'll reach after returning from the current # function. set bp_location [gdb_get_line_number "Do_Nothing" ${testdir}/foo_p708_025.adb] gdb_test "break foo_p708_025.adb:$bp_location" \ - "Breakpoint \[0-9\]+ at.*: file .*foo_p708_025.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at.*: file .*foo_p708_025.adb, line \[0-9\]+." # This breakpoint will be there to stop us after we test what happens # during a continue (see below...) gdb_test "break pck.increment" \ - "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." + "Breakpoint \[0-9\]+ at.*: file .*pck.adb, line \[0-9\]+." # Continue until we reach our watchpoint. It isn't strictly necessary # for our purpose that the watchpoint actually triggers, but this shows # that the watchpoint exists and is active. gdb_test "cont" \ - ".*atchpoint \[0-9\]+: result.*Old value = 8.*New value = 64.*" \ - "continuing to watchpoint hit" + ".*atchpoint \[0-9\]+: result.*Old value = 8.*New value = 64.*" \ + "continuing to watchpoint hit" # Continue again. We should be stopped at the (internal) breakpoint # that we setup to delete the watchpoint as soon as the program leaves @@ -66,18 +66,18 @@ gdb_test \ # (on the call to Do_Nothing) we set earlier. gdb_test "cont" \ - "Breakpoint \[0-9\]+.*Do_Nothing.*" \ - "continuing to breakpoint on call to Do_Nothing" + "Breakpoint \[0-9\]+.*Do_Nothing.*" \ + "continuing to breakpoint on call to Do_Nothing" # Do a next, to verify that it works... gdb_test "next" \ - ".* Call_Me;" \ - "next to call to Call_Me" + ".* Call_Me;" \ + "next to call to Call_Me" # And finally, one more continue. gdb_test "cont" \ - "Breakpoint \[0-9\]+.*pck\\.increment.*" \ - "continuing to breakpoint in pck.increment" + "Breakpoint \[0-9\]+.*pck\\.increment.*" \ + "continuing to breakpoint in pck.increment" diff --git a/gdb/testsuite/gdb.ada/set_wstr.exp b/gdb/testsuite/gdb.ada/set_wstr.exp index caf11fd6221..a07455e7719 100644 --- a/gdb/testsuite/gdb.ada/set_wstr.exp +++ b/gdb/testsuite/gdb.ada/set_wstr.exp @@ -20,51 +20,51 @@ require allow_ada_tests standard_ada_testfile a if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/a.adb] if {![runto "a.adb:$bp_location"]} { - return + return } # Verify that assigning to Nnn (a basic string) works... gdb_test "print nnn" \ - "= \"12345\"" \ - "print nnn before assignment" + "= \"12345\"" \ + "print nnn before assignment" gdb_test_no_output "set variable nnn := \"qcyom\"" gdb_test "print nnn" \ - "= \"qcyom\"" \ - "print nnn after assignment" + "= \"qcyom\"" \ + "print nnn after assignment" # Same with Www (a wide string)... gdb_test "print www" \ - "= \"12345\"" \ - "print www before assignment" + "= \"12345\"" \ + "print www before assignment" gdb_test_no_output "set variable www := \"zenrk\"" gdb_test "print www" \ - "= \"zenrk\"" \ - "print www after assignment" + "= \"zenrk\"" \ + "print www after assignment" # Same with Rws (a wide wide string)... gdb_test "print rws" \ - "= \"12345\"" \ - "print rws before assignment" + "= \"12345\"" \ + "print rws before assignment" gdb_test_no_output "set variable rws := \"ndhci\"" gdb_test "print rws" \ - "= \"ndhci\"" \ - "print rws after assignment" + "= \"ndhci\"" \ + "print rws after assignment" # Also, check that GDB doesn't get tricked if we assign to Www a # string twice the length of Www. The debugger should reject the @@ -72,7 +72,7 @@ gdb_test "print rws" \ # used to get tricked because the array size was the same). gdb_test "set variable www := \"1#2#3#4#5#\"" \ - "cannot assign arrays of different length" + "cannot assign arrays of different length" # However, reassigning an array of a different length should work when # the LHS is a convenience variable. diff --git a/gdb/testsuite/gdb.ada/small_reg_param.exp b/gdb/testsuite/gdb.ada/small_reg_param.exp index 9004fa7f989..f94f94a523f 100644 --- a/gdb/testsuite/gdb.ada/small_reg_param.exp +++ b/gdb/testsuite/gdb.ada/small_reg_param.exp @@ -20,13 +20,13 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-O1]] != "" } { - return + return } clean_restart ${testfile} if {![runto_main]} { - return + return } gdb_breakpoint "call_me" diff --git a/gdb/testsuite/gdb.ada/start.exp b/gdb/testsuite/gdb.ada/start.exp index 28405c6f9af..ad83bc194b7 100644 --- a/gdb/testsuite/gdb.ada/start.exp +++ b/gdb/testsuite/gdb.ada/start.exp @@ -36,5 +36,5 @@ if { [gdb_start_cmd] < 0 } { } gdb_test "" \ - "dummy \\(\\) at .*dummy.adb.*" \ - "start" + "dummy \\(\\) at .*dummy.adb.*" \ + "start" diff --git a/gdb/testsuite/gdb.ada/static-link.exp b/gdb/testsuite/gdb.ada/static-link.exp index d342521f445..3ab248ba009 100644 --- a/gdb/testsuite/gdb.ada/static-link.exp +++ b/gdb/testsuite/gdb.ada/static-link.exp @@ -27,7 +27,7 @@ clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/prog.adb] if {![runto "prog.adb:$bp_location"]} { - return + return } gdb_test "ptype value" [string_to_regexp "type = array (1 .. 3) of integer"] diff --git a/gdb/testsuite/gdb.ada/str_binop_equal.exp b/gdb/testsuite/gdb.ada/str_binop_equal.exp index 412d1bf30fb..0d49ee6d2e4 100644 --- a/gdb/testsuite/gdb.ada/str_binop_equal.exp +++ b/gdb/testsuite/gdb.ada/str_binop_equal.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_p211_061 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -29,13 +29,13 @@ set bp_location [gdb_get_line_number "STOP" ${testdir}/foo_p211_061.adb] runto "foo_p211_061.adb:$bp_location" gdb_test "print my_str = my_str" \ - " = true" + " = true" gdb_test "print my_str = \"ABCD\"" \ " = true" gdb_test "print my_str = \"EFGH\"" \ - " = false" + " = false" gdb_test "print my_str = \"AB\"" \ - " = false" + " = false" diff --git a/gdb/testsuite/gdb.ada/str_chars.exp b/gdb/testsuite/gdb.ada/str_chars.exp index ee644aa9fa8..86cabe15ecc 100644 --- a/gdb/testsuite/gdb.ada/str_chars.exp +++ b/gdb/testsuite/gdb.ada/str_chars.exp @@ -22,7 +22,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/str_ref_cmp.exp b/gdb/testsuite/gdb.ada/str_ref_cmp.exp index 9bea50a469d..31afe414e0e 100644 --- a/gdb/testsuite/gdb.ada/str_ref_cmp.exp +++ b/gdb/testsuite/gdb.ada/str_ref_cmp.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -44,7 +44,7 @@ gdb_test_multiple {print "a" = "a"} $test { # Verify that we can compare a string slice with another string. gdb_test "print String_Var (1 .. 3) = \"Hel\"" \ - "= true" + "= true" gdb_test "print String_Var (1 .. 3) = \"hel\"" \ - "= false" + "= false" diff --git a/gdb/testsuite/gdb.ada/str_uninit.exp b/gdb/testsuite/gdb.ada/str_uninit.exp index 48ead17ccfc..8c85f96fc05 100644 --- a/gdb/testsuite/gdb.ada/str_uninit.exp +++ b/gdb/testsuite/gdb.ada/str_uninit.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile parse if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/parse.adb] if {![runto "parse.adb:$bp_location"]} { - return + return } # Print MY_STR. Since the string has not been initialized, including diff --git a/gdb/testsuite/gdb.ada/sub_variant.exp b/gdb/testsuite/gdb.ada/sub_variant.exp index 515479ec7c9..0e8a9aa976c 100644 --- a/gdb/testsuite/gdb.ada/sub_variant.exp +++ b/gdb/testsuite/gdb.ada/sub_variant.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile subv if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/sym_print_name.exp b/gdb/testsuite/gdb.ada/sym_print_name.exp index b1c310637ae..a97979f2461 100644 --- a/gdb/testsuite/gdb.ada/sym_print_name.exp +++ b/gdb/testsuite/gdb.ada/sym_print_name.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -36,17 +36,17 @@ set menu [multi_line "Multiple matches for integervar" \ set test_name "multiple matches for symbol integervar" gdb_test_multiple "print integervar" "$test_name" \ -{ - -re "$menu" { - pass "$test_name" - } - - default { - fail "$test_name" - } -} + { + -re "$menu" { + pass "$test_name" + } + + default { + fail "$test_name" + } + } # Select the first choice from the multiple-choice menu above. gdb_test "1" \ - "= 48" \ - "select first choice from multiple-choice menu" + "= 48" \ + "select first choice from multiple-choice menu" diff --git a/gdb/testsuite/gdb.ada/taft_type.exp b/gdb/testsuite/gdb.ada/taft_type.exp index 9f758bf4aec..52967ade4a7 100644 --- a/gdb/testsuite/gdb.ada/taft_type.exp +++ b/gdb/testsuite/gdb.ada/taft_type.exp @@ -20,15 +20,15 @@ require allow_ada_tests standard_ada_testfile p if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/p.adb] if {![runto "p.adb:$bp_location"]} { - return + return } gdb_test "print w.e.all" \ - "= \\(month => 8, year => 1974\\)" + "= \\(month => 8, year => 1974\\)" diff --git a/gdb/testsuite/gdb.ada/tagged-lookup.exp b/gdb/testsuite/gdb.ada/tagged-lookup.exp index 65c0fd3f9fa..54098f8dc0c 100644 --- a/gdb/testsuite/gdb.ada/tagged-lookup.exp +++ b/gdb/testsuite/gdb.ada/tagged-lookup.exp @@ -23,7 +23,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/tagged.exp b/gdb/testsuite/gdb.ada/tagged.exp index 2d91e5077d3..4d0014a3de2 100644 --- a/gdb/testsuite/gdb.ada/tagged.exp +++ b/gdb/testsuite/gdb.ada/tagged.exp @@ -22,7 +22,7 @@ require gnat_runtime_has_debug_info standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -34,19 +34,19 @@ runto "foo.adb:$bp_location" # class-wide. gdb_test "ptype segm" \ - [multi_line "type = new pck\\.object with record" \ - " width: integer;" \ - "end record" ] + [multi_line "type = new pck\\.object with record" \ + " width: integer;" \ + "end record" ] gdb_test "print segm" \ - "= \\(position => 74, width => 8\\)" + "= \\(position => 74, width => 8\\)" # Now, test printing of an class-wide object. gdb_test "ptype obj" \ - [multi_line "type = new pck\\.object with record" \ - " width: integer;" \ - "end record" ] + [multi_line "type = new pck\\.object with record" \ + " width: integer;" \ + "end record" ] gdb_test "print obj" \ - "= \\(position => 74, width => 8\\)" + "= \\(position => 74, width => 8\\)" diff --git a/gdb/testsuite/gdb.ada/task_bp.exp b/gdb/testsuite/gdb.ada/task_bp.exp index eb7fee19541..27b74671050 100644 --- a/gdb/testsuite/gdb.ada/task_bp.exp +++ b/gdb/testsuite/gdb.ada/task_bp.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } # Insert a breakpoint at LOC, and run the program expecting us to @@ -36,18 +36,18 @@ if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } # order to test one given linespec under multiple conditions. proc test_bp { loc msg } { - gdb_test "break $loc" \ - "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*pck.adb, line \[0-9\]+\\." \ - "break $loc - $msg" + gdb_test "break $loc" \ + "Breakpoint \[0-9\]+ at 0x\[0-9a-fA-F\]+: file .*pck.adb, line \[0-9\]+\\." \ + "break $loc - $msg" - gdb_run_cmd - gdb_test "" \ - "Breakpoint \[0-9\]+, pck\\.dummy_task (.*)" \ - "run to $loc - $msg" + gdb_run_cmd + gdb_test "" \ + "Breakpoint \[0-9\]+, pck\\.dummy_task (.*)" \ + "run to $loc - $msg" } set all_linespecs { "pck.dummy_task" "dummy_task" - "pck.adb:pck.dummy_task" "pck.adb:dummy_task"} + "pck.adb:pck.dummy_task" "pck.adb:dummy_task"} # First, test the linespecs when the associated symtab hasn't been # expanded yet. diff --git a/gdb/testsuite/gdb.ada/task_switch_in_core.exp b/gdb/testsuite/gdb.ada/task_switch_in_core.exp index fb92844cb24..b10c93a7c2b 100644 --- a/gdb/testsuite/gdb.ada/task_switch_in_core.exp +++ b/gdb/testsuite/gdb.ada/task_switch_in_core.exp @@ -20,7 +20,7 @@ require allow_ada_tests gcore_cmd_available standard_ada_testfile crash if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -38,7 +38,7 @@ if {![runto request_for_crash]} { set corefile [standard_output_file crash.gcore] set core_supported [gdb_gcore_cmd "$corefile" "save a corefile"] if {!$core_supported} { - return + return } # Now that the core file has been created, we can start the real @@ -56,14 +56,14 @@ if { $core_loaded == -1 } { # First, switch to task 1. gdb_test "task 1" \ - "crash\\.request_for_crash \\(\\) at .*crash\\.adb:$decimal.*" + "crash\\.request_for_crash \\(\\) at .*crash\\.adb:$decimal.*" gdb_test "info tasks" \ - [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \ - "\\*\\s+1\\s+.*main_task" \ - "\\s+2.*my_t"] \ - "info tasks after switching to task 1" + [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \ + "\\*\\s+1\\s+.*main_task" \ + "\\s+2.*my_t"] \ + "info tasks after switching to task 1" # Switch to task 2. Unlike in the case where we tested the switch to # task 1, don't check the location where the debugger says the program @@ -73,10 +73,10 @@ gdb_test "info tasks" \ # we will verify right after with an additional test that the current # task is now task 2. gdb_test "task 2" \ - "\\\[Switching to task 2 \"my_t\"\\\].*" + "\\\[Switching to task 2 \"my_t\"\\\].*" gdb_test "info tasks" \ - [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \ - "\\s+1\\s+.*main_task" \ - "\\*\\s+2.*my_t"] \ - "info tasks after switching to task 2" + [multi_line "\\s+ID\\s+TID\\s+P-ID\\s+Pri\\s+State\\s+Name" \ + "\\s+1\\s+.*main_task" \ + "\\*\\s+2.*my_t"] \ + "info tasks after switching to task 2" diff --git a/gdb/testsuite/gdb.ada/task_watch.exp b/gdb/testsuite/gdb.ada/task_watch.exp index 0cfd3b759e5..a39773f4925 100644 --- a/gdb/testsuite/gdb.ada/task_watch.exp +++ b/gdb/testsuite/gdb.ada/task_watch.exp @@ -24,7 +24,7 @@ require allow_hw_watchpoint_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/tasks.exp b/gdb/testsuite/gdb.ada/tasks.exp index ad1b7d8642c..9862663d566 100644 --- a/gdb/testsuite/gdb.ada/tasks.exp +++ b/gdb/testsuite/gdb.ada/tasks.exp @@ -22,7 +22,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -33,13 +33,13 @@ runto "foo.adb:$bp_location" # Make sure that all tasks appear in the "info tasks" listing, and # that the active task is the environment task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - "\\* +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - " +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ - "info tasks before inserting breakpoint" + [join {" +ID +TID P-ID Pri State +Name" \ + "\\* +1 .* main_task" \ + " +2 .* task_list\\(1\\)" \ + " +3 .* task_list\\(2\\)" \ + " +4 .* task_list\\(3\\)"} \ + "\r\n"] \ + "info tasks before inserting breakpoint" # Confirm that the "info threads" output lines up with the tasks list. gdb_test "info threads" \ @@ -159,19 +159,19 @@ if {[allow_guile_tests]} { # task 3 will hit our breakpoint, and GDB is expected to stop at that # point. Also make sure that GDB reports the correct breakpoint number. gdb_test "continue" \ - ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \ - "continue to breakpoint" + ".*Breakpoint $bp_number, foo.break_me \\(\\).*" \ + "continue to breakpoint" # Check that it is indeed task 3 that hit the breakpoint by checking # which is the active task. gdb_test "info tasks" \ - [join {" +ID +TID P-ID Pri State +Name" \ - " +1 .* main_task" \ - " +2 .* task_list\\(1\\)" \ - "\\* +3 .* task_list\\(2\\)" \ - " +4 .* task_list\\(3\\)"} \ - "\r\n"] \ - "info tasks after hitting breakpoint" + [join {" +ID +TID P-ID Pri State +Name" \ + " +1 .* main_task" \ + " +2 .* task_list\\(1\\)" \ + "\\* +3 .* task_list\\(2\\)" \ + " +4 .* task_list\\(3\\)"} \ + "\r\n"] \ + "info tasks after hitting breakpoint" # Now, resume the execution and make sure that GDB does not stop when # task 4 hits the breakpoint. Continuing thus results in our program diff --git a/gdb/testsuite/gdb.ada/tick_last_segv.exp b/gdb/testsuite/gdb.ada/tick_last_segv.exp index 0ba50a8b43e..1f306139a36 100644 --- a/gdb/testsuite/gdb.ada/tick_last_segv.exp +++ b/gdb/testsuite/gdb.ada/tick_last_segv.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} @@ -31,9 +31,9 @@ clean_restart ${testfile} # The actual value printed is of no interest in this testcase. gdb_test "print short_integer'first" \ - "= -\[0-9\]+" \ - "print short-integer'first" + "= -\[0-9\]+" \ + "print short-integer'first" gdb_test "print short_integer'last" \ - "= \[0-9\]+" \ - "print short-integer'last" + "= \[0-9\]+" \ + "print short-integer'last" diff --git a/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp b/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp index c8c12822a4e..f90f1d7acc9 100644 --- a/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp +++ b/gdb/testsuite/gdb.ada/tick_length_array_enum_idx.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_n207_004 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/type_coercion.exp b/gdb/testsuite/gdb.ada/type_coercion.exp index c8ea13c8b3e..713f4344dcb 100644 --- a/gdb/testsuite/gdb.ada/type_coercion.exp +++ b/gdb/testsuite/gdb.ada/type_coercion.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile assign if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -29,19 +29,19 @@ set bp_location [gdb_get_line_number "START" ${testdir}/assign.adb] runto "assign.adb:$bp_location" gdb_test "p q" \ - "= \\(2, 3, 5, 7, 11\\)" "initial value of q" + "= \\(2, 3, 5, 7, 11\\)" "initial value of q" gdb_test_no_output "set \$addr := q'address" \ - "save q'address in convenience variable" + "save q'address in convenience variable" gdb_test "p {Integer} \$addr" \ - "= 2" \ - "print {Integer} \$addr" + "= 2" \ + "print {Integer} \$addr" # Now change the value at $addr using the same "{TYPE}" syntax. gdb_test_no_output "set {Integer} \$addr := 19" \ - "set {Integer} \$addr := 19" + "set {Integer} \$addr := 19" gdb_test "p q" \ - "= \\(19, 3, 5, 7, 11\\)" "modified value of q" + "= \\(19, 3, 5, 7, 11\\)" "modified value of q" diff --git a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp index f806d94d274..1acf9900082 100644 --- a/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp +++ b/gdb/testsuite/gdb.ada/uninitialized-variable-record.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile parse if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/uninitialized_vars.exp b/gdb/testsuite/gdb.ada/uninitialized_vars.exp index 83b6606e017..d0c389f9863 100644 --- a/gdb/testsuite/gdb.ada/uninitialized_vars.exp +++ b/gdb/testsuite/gdb.ada/uninitialized_vars.exp @@ -23,7 +23,7 @@ require allow_ada_tests standard_ada_testfile parse if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -35,4 +35,4 @@ runto "parse.adb:$bp_location" # Check that printing uninitialized variables does not crash the debugger. gdb_test "info locals" \ - ".*" + ".*" diff --git a/gdb/testsuite/gdb.ada/unsigned_last.exp b/gdb/testsuite/gdb.ada/unsigned_last.exp index f0bd18c12ec..40fa75e15e9 100644 --- a/gdb/testsuite/gdb.ada/unsigned_last.exp +++ b/gdb/testsuite/gdb.ada/unsigned_last.exp @@ -23,7 +23,7 @@ require allow_ada_tests standard_ada_testfile main if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/var_arr_attrs.exp b/gdb/testsuite/gdb.ada/var_arr_attrs.exp index 0878d46fdf5..c7fa8c65362 100644 --- a/gdb/testsuite/gdb.ada/var_arr_attrs.exp +++ b/gdb/testsuite/gdb.ada/var_arr_attrs.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile foo_o115_002 if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/var_arr_typedef.exp b/gdb/testsuite/gdb.ada/var_arr_typedef.exp index c58efdf7bb5..53643e0fe5b 100644 --- a/gdb/testsuite/gdb.ada/var_arr_typedef.exp +++ b/gdb/testsuite/gdb.ada/var_arr_typedef.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile var_arr_typedef if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug]] != "" } { - return + return } clean_restart ${testfile} @@ -37,10 +37,10 @@ set vb "\\($rb, $rb, $ra, $ra\\)" set a "\\($va, $va, $vb, $vb\\)" gdb_test "print va" \ - " = $va" + " = $va" gdb_test "print vb" \ - " = $vb" + " = $vb" gdb_test "print a" \ - " = $a" + " = $a" diff --git a/gdb/testsuite/gdb.ada/variant-record.exp b/gdb/testsuite/gdb.ada/variant-record.exp index 3861f0dcd83..ff032a3dec3 100644 --- a/gdb/testsuite/gdb.ada/variant-record.exp +++ b/gdb/testsuite/gdb.ada/variant-record.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile proc if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/variant_record_field.exp b/gdb/testsuite/gdb.ada/variant_record_field.exp index 3cc613e1249..134d1bae594 100644 --- a/gdb/testsuite/gdb.ada/variant_record_field.exp +++ b/gdb/testsuite/gdb.ada/variant_record_field.exp @@ -32,7 +32,7 @@ standard_ada_testfile foo # making guarantees beyond -Og though, so test that. if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug optimize=-Og]] != ""} { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/varsize_limit.exp b/gdb/testsuite/gdb.ada/varsize_limit.exp index bb877e81be3..11eb1fe2772 100644 --- a/gdb/testsuite/gdb.ada/varsize_limit.exp +++ b/gdb/testsuite/gdb.ada/varsize_limit.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile vsizelim if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/vsizelim.adb] if {![runto "vsizelim.adb:$bp_location"]} { - return + return } gdb_test "set varsize-limit 16" \ diff --git a/gdb/testsuite/gdb.ada/vla.exp b/gdb/testsuite/gdb.ada/vla.exp index 054431a16d3..0f7d9bbb5ef 100644 --- a/gdb/testsuite/gdb.ada/vla.exp +++ b/gdb/testsuite/gdb.ada/vla.exp @@ -29,10 +29,10 @@ set bp_location [gdb_get_line_number "Set breakpoint here" ${testdir}/vla.adb] runto "vla.adb:$bp_location" gdb_test "print r00" \ - "= \\(l1 => 0, l2 => 0, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(\\), i3 => 3\\)" + "= \\(l1 => 0, l2 => 0, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(\\), i3 => 3\\)" gdb_test "print r01" \ - "= \\(l1 => 0, l2 => 1, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(20\\), i3 => 3\\)" + "= \\(l1 => 0, l2 => 1, i1 => 1, a1 => \\(\\), i2 => 2, a2 => \\(20\\), i3 => 3\\)" gdb_test "print r10" \ - "= \\(l1 => 1, l2 => 0, i1 => 1, a1 => \\(10\\), i2 => 2, a2 => \\(\\), i3 => 3\\)" + "= \\(l1 => 1, l2 => 0, i1 => 1, a1 => \\(10\\), i2 => 2, a2 => \\(\\), i3 => 3\\)" gdb_test "print r22" \ - "= \\(l1 => 2, l2 => 2, i1 => 1, a1 => \\(10, 10\\), i2 => 2, a2 => \\(20, 20\\), i3 => 3\\)" + "= \\(l1 => 2, l2 => 2, i1 => 1, a1 => \\(10, 10\\), i2 => 2, a2 => \\(20, 20\\), i3 => 3\\)" diff --git a/gdb/testsuite/gdb.ada/voidctx.exp b/gdb/testsuite/gdb.ada/voidctx.exp index 12edcb516da..6ad4dd8c39d 100644 --- a/gdb/testsuite/gdb.ada/voidctx.exp +++ b/gdb/testsuite/gdb.ada/voidctx.exp @@ -20,7 +20,7 @@ require allow_ada_tests standard_ada_testfile voidctx if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} diff --git a/gdb/testsuite/gdb.ada/watch_arg.exp b/gdb/testsuite/gdb.ada/watch_arg.exp index 26099e45d0a..5323247bfbb 100644 --- a/gdb/testsuite/gdb.ada/watch_arg.exp +++ b/gdb/testsuite/gdb.ada/watch_arg.exp @@ -31,14 +31,14 @@ runto "watch.adb:$bp_location" # Insert a watchpoint on argument X gdb_test "watch x" \ - ".*atchpoint \[0-9\]+: x" \ - "set watchpoint on function argument X" + ".*atchpoint \[0-9\]+: x" \ + "set watchpoint on function argument X" # Then insert a breakpoint at the location we'd like to continue to... set bp_location [gdb_get_line_number "BREAK2" ${testdir}/watch.adb] gdb_test "break watch.adb:$bp_location" \ - "Breakpoint \[0-9\]+ at.*: file .*watch.adb, line \[0-9\]+." \ - "insert second breakpoint in watch.adb" + "Breakpoint \[0-9\]+ at.*: file .*watch.adb, line \[0-9\]+." \ + "insert second breakpoint in watch.adb" # Continue again. We should be stopped at the (internal) breakpoint # that we setup to delete the watchpoint as soon as the program leaves @@ -53,5 +53,5 @@ gdb_test \ # we inserted. gdb_test "cont" \ - "Breakpoint \[0-9\]+, watch \\(\\).*" \ - "continuing to second breakpoint" + "Breakpoint \[0-9\]+, watch \\(\\).*" \ + "continuing to second breakpoint" diff --git a/gdb/testsuite/gdb.ada/watch_minus_l.exp b/gdb/testsuite/gdb.ada/watch_minus_l.exp index f080829decb..2e1c36b073d 100644 --- a/gdb/testsuite/gdb.ada/watch_minus_l.exp +++ b/gdb/testsuite/gdb.ada/watch_minus_l.exp @@ -31,7 +31,7 @@ runto "foo_ra10_006.adb:$bp_location" # Insert a watchpoint on argument X gdb_test "watch -location pck.global_var" \ - ".*atchpoint \[0-9\]+: -location pck.global_var" + ".*atchpoint \[0-9\]+: -location pck.global_var" # Continue again. We should be stopped at the (internal) breakpoint # that we setup to delete the watchpoint as soon as the program leaves diff --git a/gdb/testsuite/gdb.ada/whatis_array_val.exp b/gdb/testsuite/gdb.ada/whatis_array_val.exp index f93d1908f47..366fb9f8491 100644 --- a/gdb/testsuite/gdb.ada/whatis_array_val.exp +++ b/gdb/testsuite/gdb.ada/whatis_array_val.exp @@ -20,22 +20,22 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "STOP" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } # Accept "foo." prefix for older versions of GNAT. gdb_test "whatis full" \ - "type = (foo\\.)?full_table" + "type = (foo\\.)?full_table" gdb_test "print full" \ - " = \\(144, 233, 377, 610, 987\\)" + " = \\(144, 233, 377, 610, 987\\)" gdb_test "whatis $" \ - "type = (foo\\.)?full_table" + "type = (foo\\.)?full_table" diff --git a/gdb/testsuite/gdb.ada/widewide.exp b/gdb/testsuite/gdb.ada/widewide.exp index 198394c00f4..13175d595f7 100644 --- a/gdb/testsuite/gdb.ada/widewide.exp +++ b/gdb/testsuite/gdb.ada/widewide.exp @@ -20,14 +20,14 @@ require allow_ada_tests standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug ]] != "" } { - return + return } clean_restart ${testfile} set bp_location [gdb_get_line_number "START" ${testdir}/foo.adb] if {![runto "foo.adb:$bp_location"]} { - return + return } gdb_test "print some_easy" "= 74 'J'" diff --git a/gdb/testsuite/gdb.ada/win_fu_syms.exp b/gdb/testsuite/gdb.ada/win_fu_syms.exp index f3e7bed3bd7..ed6734576e8 100644 --- a/gdb/testsuite/gdb.ada/win_fu_syms.exp +++ b/gdb/testsuite/gdb.ada/win_fu_syms.exp @@ -21,17 +21,17 @@ require ada_shared_link standard_ada_testfile foo if {[gdb_compile_ada "${srcfile}" "${binfile}" executable [list debug additional_flags=-bargs additional_flags=-shared additional_flags=-margs]] != "" } { - return + return } clean_restart ${testfile} set loc [gdb_get_line_number "Integer" ${testdir}/foo.adb] gdb_test "info line foo.adb:$loc" \ - "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \ - "info line on variable declaration" + "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \ + "info line on variable declaration" set loc [gdb_get_line_number "Do_Nothing" ${testdir}/foo.adb] gdb_test "info line foo.adb:$loc" \ - "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \ - "info line on Do_Nothing call" + "Line $decimal of \".*foo\\.adb\" starts at address $hex <_ada_foo\\+$decimal> and ends at $hex <_ada_foo\\+$decimal>\\." \ + "info line on Do_Nothing call"