From 5e830d9807b91f806524ff822d953443c8fb3d2f Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 13 Oct 2017 10:11:57 +0100 Subject: [PATCH] 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. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.base/shlib-call.exp | 26 +++++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 38add6f..9aac613 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 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 + gdb_file_cmd instead of prepare_for_testing and no longer skip "before run" tests on is_remote target boards. Update comments. diff --git a/gdb/testsuite/gdb.base/shlib-call.exp b/gdb/testsuite/gdb.base/shlib-call.exp index e1664da..2c9b495 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 -- 2.7.4