| Index: gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
|
| diff --git a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
|
| similarity index 57%
|
| copy from gdb/testsuite/gdb.dwarf2/watch-notconst.exp
|
| copy to gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
|
| index 58e1d0dd2460a8af3e40bf64b03d4f768b0b8a16..6731c9e24d3d2fc97b16a39b7cd833fb7635eae3 100644
|
| --- a/gdb/testsuite/gdb.dwarf2/watch-notconst.exp
|
| +++ b/gdb/testsuite/gdb.dwarf2/dw2-common-block.exp
|
| @@ -1,4 +1,4 @@
|
| -# Copyright 2010-2012 Free Software Foundation, Inc.
|
| +# Copyright 2012-2013 Free Software Foundation, Inc.
|
|
|
| # This program is free software; you can redistribute it and/or modify
|
| # it under the terms of the GNU General Public License as published by
|
| @@ -12,28 +12,39 @@
|
| #
|
| # You should have received a copy of the GNU General Public License
|
| # along with this program. If not, see <http://www.gnu.org/licenses/>.
|
| -load_lib dwarf.exp
|
|
|
| -set test "watch-notconst"
|
| +load_lib dwarf.exp
|
|
|
| # This test can only be run on targets which support DWARF-2 and use gas.
|
| if ![dwarf2_support] {
|
| return 0
|
| }
|
|
|
| -# This test can only be run on x86 targets.
|
| -if { ![is_x86_like_target] } {
|
| +# This test can only be run on x86-64 targets.
|
| +if {![istarget x86_64-*] || ![is_lp64_target]} {
|
| return 0
|
| }
|
|
|
| -if { [prepare_for_testing "${test}.exp" "${test}" \
|
| - {watch-notconst.c watch-notconst2.S} {nodebug}] } {
|
| +# It requires fortran.
|
| +if {[skip_fortran_tests]} {
|
| + return 0
|
| +}
|
| +
|
| +standard_testfile .S
|
| +
|
| +if { [prepare_for_testing "${testfile}.exp" "${testfile}" $srcfile \
|
| + {nodebug f90}] } {
|
| return -1
|
| }
|
|
|
| -if { ![runto f] } {
|
| - perror "Could not run to breakpoint `f'."
|
| +if ![runto MAIN__] then {
|
| + perror "couldn't run to breakpoint MAIN__"
|
| continue
|
| }
|
|
|
| -gdb_test "watch x" ".*\[Ww\]atchpoint 2: x" "watch x"
|
| +gdb_breakpoint [gdb_get_line_number "stop-here-out" \
|
| + ../gdb.fortran/common-block.f90]
|
| +gdb_continue_to_breakpoint "stop-here-out"
|
| +
|
| +gdb_test "p ix" " = 1" "p ix out"
|
| +gdb_test "p iy" " = 2" "p iy out"
|
|
|