diff options
| -rw-r--r-- | gdb/testsuite/gdb.fortran/array-slices.exp | 30 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/array-slices.f90 | 2 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/lbound-ubound.exp | 28 |
3 files changed, 45 insertions, 15 deletions
diff --git a/gdb/testsuite/gdb.fortran/array-slices.exp b/gdb/testsuite/gdb.fortran/array-slices.exp index 8f9c012e399..a38276c67e4 100644 --- a/gdb/testsuite/gdb.fortran/array-slices.exp +++ b/gdb/testsuite/gdb.fortran/array-slices.exp @@ -35,6 +35,11 @@ if {[skip_fortran_tests]} { return -1 } +# This test relies on output from the inferior. +if [target_info exists gdb,noinferiorio] { + return -1 +} + standard_testfile ".f90" load_lib fortran.exp @@ -62,12 +67,6 @@ proc run_test { repack } { return -1 } - # This test relies on output from the inferior and is not supported on - # remote targets. - if {![gdb_is_target_native]} { - return 0 - } - # Avoid libc symbols, in particular the 'array' type. gdb_test_no_output "nosharedlibrary" @@ -97,11 +96,19 @@ proc run_test { repack } { set found_final_breakpoint false set expected_result "" set func_name "" + set found_prompt false gdb_test_multiple "continue" "continue" { + -i $::inferior_spawn_id + -re ".*GDB = (\[^\r\n\]+)\r\n" { set expected_result $expect_out(1,string) - exp_continue + if {!$found_prompt} { + exp_continue + } } + + -i $::gdb_spawn_id + -re "! Display Element" { set func_name "show_elem" exp_continue @@ -119,7 +126,14 @@ proc run_test { repack } { exp_continue } -re "$gdb_prompt $" { - # We're done. + set found_prompt true + + if {$found_final_breakpoint + || ($expected_result != "" && $func_name != "")} { + # We're done. + } else { + exp_continue + } } } diff --git a/gdb/testsuite/gdb.fortran/array-slices.f90 b/gdb/testsuite/gdb.fortran/array-slices.f90 index ff3964ffb6b..1eaee82b7b7 100644 --- a/gdb/testsuite/gdb.fortran/array-slices.f90 +++ b/gdb/testsuite/gdb.fortran/array-slices.f90 @@ -61,7 +61,7 @@ subroutine show_1d (array) end if write(*, fmt="(I0)", advance="no") array (i) end do - write(*, fmt="(A)", advance="no") ")" + write(*, fmt="(A)", advance="yes") ")" print *, "" ! Display Array Slice 1D end subroutine show_1d diff --git a/gdb/testsuite/gdb.fortran/lbound-ubound.exp b/gdb/testsuite/gdb.fortran/lbound-ubound.exp index 671b251c799..709b74a69e8 100644 --- a/gdb/testsuite/gdb.fortran/lbound-ubound.exp +++ b/gdb/testsuite/gdb.fortran/lbound-ubound.exp @@ -32,9 +32,8 @@ if ![fortran_runto_main] { return -1 } -# This test relies on output from the inferior and is not supported on -# remote targets. -if {![gdb_is_target_native]} { +# This test relies on output from the inferior. +if [target_info exists gdb,noinferiorio] { return 0 } @@ -55,15 +54,25 @@ while { $test_count < 500 } { set expected_lbound "" set expected_ubound "" + set found_prompt false gdb_test_multiple "continue" "continue" { + -i $::inferior_spawn_id + -re ".*LBOUND = (\[^\r\n\]+)\r\n" { set expected_lbound $expect_out(1,string) - exp_continue + if {!$found_prompt} { + exp_continue + } } -re ".*UBOUND = (\[^\r\n\]+)\r\n" { set expected_ubound $expect_out(1,string) - exp_continue + if {!$found_prompt} { + exp_continue + } } + + -i $::gdb_spawn_id + -re "! Test Breakpoint" { set func_name "show_elem" exp_continue @@ -73,7 +82,14 @@ while { $test_count < 500 } { exp_continue } -re "$gdb_prompt $" { - # We're done. + set found_prompt true + + if {$found_final_breakpoint + || ($expected_lbound != "" && $expected_ubound != "")} { + # We're done. + } else { + exp_continue + } } } |