From: Pedro Alves Date: Fri, 13 Oct 2017 09:11:57 +0000 (+0100) Subject: Eliminate is_remote check in gdb.base/shlib-call.exp X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5e830d9807b91f806524ff822d953443c8fb3d2f;p=binutils-gdb.git Eliminate is_remote check in gdb.base/shlib-call.exp gdb/testsuite/ChangeLog: 2017-10-13 Pedro Alves * gdb.base/shlib-call.exp (top level): Use gdb_run_cmd and remove is_remote target check. --- diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 38add6f50b2..9aac613e247 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-13 Pedro Alves + + * gdb.base/shlib-call.exp (top level): Use gdb_run_cmd and remove + is_remote target check. + 2017-10-13 Pedro Alves * gdb.base/scope.exp: Use build_executable + clean_restart + diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index e1664da1a83..2c9b4957aa9 100644 --- a/gdb/testsuite/gdb.base/shlib-call.exp +++ b/gdb/testsuite/gdb.base/shlib-call.exp @@ -170,18 +170,22 @@ gdb_test_no_output "set width 0" # test that we can re-set breakpoints in shared libraries gdb_breakpoint "shr1" "allow-pending" -# FIXME: should not send "run" explicitly. Non-portable. - -if ![is_remote target] { - gdb_test "run" "Starting program:.*Breakpoint .,.*" \ - "run to bp in shared library" - - gdb_continue_to_end "" continue 1 +set test "run to bp in shared library" +gdb_run_cmd +gdb_test_multiple "" $test { + -re "Breakpoint .,.*${gdb_prompt} " { + pass $test + } +} - gdb_test "run" "Starting program:.*Breakpoint .,.*" \ - "re-run to bp in shared library (PR's 16495, 18213)" +gdb_continue_to_end "" continue 1 - gdb_continue_to_end "" continue 1 +set test "re-run to bp in shared library (PR's 16495, 18213)" +gdb_run_cmd +gdb_test_multiple "" $test { + -re "Breakpoint .,.*${gdb_prompt} " { + pass $test + } } -return 0 +gdb_continue_to_end "" continue 1