diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b702fa0..78826db 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-20 Yao Qi <yao@codesourcery.com> + + * lib/gdb.exp (default_gdb_init): Rename argument 'args' by + 'test_file_name'. Treat args as a string instead of a list. + (gdb_init): Rename argument 'args' by 'test_file_name'. + 2014-05-19 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.arch/powerpc-power.exp: New file. diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3125e7a..a34ab3a 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3519,17 +3519,18 @@ proc gdb_continue { function } { return [gdb_test "continue" ".*Breakpoint $decimal, $function .*" "continue to $function"] } -proc default_gdb_init { args } { +proc default_gdb_init { test_file_name } { global gdb_wrapper_initialized global gdb_wrapper_target global gdb_test_file_name global cleanfiles + global pf_prefix set cleanfiles {} gdb_clear_suppressed - set gdb_test_file_name [file rootname [file tail [lindex $args 0]]] + set gdb_test_file_name [file rootname [file tail $test_file_name]] # Make sure that the wrapper is rebuilt # with the appropriate multilib option. @@ -3545,13 +3546,8 @@ proc default_gdb_init { args } { match_max [match_max -d] # We want to add the name of the TCL testcase to the PASS/FAIL messages. - if { [llength $args] > 0 } { - global pf_prefix + set pf_prefix "[file tail [file dirname $test_file_name]]/[file tail $test_file_name]:" - set file [lindex $args 0] - - set pf_prefix "[file tail [file dirname $file]]/[file tail $file]:" - } global gdb_prompt if [target_info exists gdb_prompt] { set gdb_prompt [target_info gdb_prompt] @@ -3687,7 +3683,7 @@ set banned_procedures { strace } # if the banned variables and procedures are already traced. set banned_traced 0 -proc gdb_init { args } { +proc gdb_init { test_file_name } { # Reset the timeout value to the default. This way, any testcase # that changes the timeout value without resetting it cannot affect # the timeout used in subsequent testcases. @@ -3766,7 +3762,7 @@ proc gdb_init { args } { set gdbserver_reconnect_p 1 unset gdbserver_reconnect_p - return [eval default_gdb_init $args] + return [default_gdb_init $test_file_name] } proc gdb_finish { } { |