Add test name argument to get_valueof, get_integer_valueof and get_sizeof
An optional parameter TEST has been added to get_hexadecimal_valueof in commit: https://sourceware.org/ml/gdb-patches/2016-06/msg00469.html This patch adds a similar optional parameter to other related methods that retrieve expression values: get_valueof, get_integer_valueof and get_sizeof. Thus tests that evaluate same expression multiple times can provide custom test names, ensuring that test names will be unique. gdb/testsuite/ChangeLog: 2017-03-14 Anton Kolesov <anton.kolesov@synopsys.com> * lib/gdb.exp (get_valueof, get_integer_valueof, get_sizeof): Add optional 'test' parameter.
This commit is contained in:
parent
a379284af2
commit
0efcde634d
2 changed files with 32 additions and 7 deletions
|
@ -1,3 +1,8 @@
|
|||
2017-03-14 Anton Kolesov <anton.kolesov@synopsys.com>
|
||||
|
||||
* lib/gdb.exp (get_valueof, get_integer_valueof, get_sizeof):
|
||||
Add optional 'test' parameter.
|
||||
|
||||
2017-03-13 Simon Marchi <simon.marchi@ericsson.com>
|
||||
|
||||
* gdb.base/commands.exp (backslash_in_multi_line_command_test):
|
||||
|
|
|
@ -5523,10 +5523,18 @@ proc prepare_for_testing { testname executable {sources ""} {options {debug}}} {
|
|||
return 0
|
||||
}
|
||||
|
||||
proc get_valueof { fmt exp default } {
|
||||
# Retrieve the value of EXP in the inferior, represented in format
|
||||
# specified in FMT (using "printFMT"). DEFAULT is used as fallback if
|
||||
# print fails. TEST is the test message to use. It can be omitted,
|
||||
# in which case a test message is built from EXP.
|
||||
|
||||
proc get_valueof { fmt exp default {test ""} } {
|
||||
global gdb_prompt
|
||||
|
||||
set test "get valueof \"${exp}\""
|
||||
if {$test == "" } {
|
||||
set test "get valueof \"${exp}\""
|
||||
}
|
||||
|
||||
set val ${default}
|
||||
gdb_test_multiple "print${fmt} ${exp}" "$test" {
|
||||
-re "\\$\[0-9\]* = (.*)\[\r\n\]*$gdb_prompt $" {
|
||||
|
@ -5540,10 +5548,18 @@ proc get_valueof { fmt exp default } {
|
|||
return ${val}
|
||||
}
|
||||
|
||||
proc get_integer_valueof { exp default } {
|
||||
# Retrieve the value of EXP in the inferior, as a signed decimal value
|
||||
# (using "print /d"). DEFAULT is used as fallback if print fails.
|
||||
# TEST is the test message to use. It can be omitted, in which case
|
||||
# a test message is built from EXP.
|
||||
|
||||
proc get_integer_valueof { exp default {test ""} } {
|
||||
global gdb_prompt
|
||||
|
||||
set test "get integer valueof \"${exp}\""
|
||||
if {$test == ""} {
|
||||
set test "get integer valueof \"${exp}\""
|
||||
}
|
||||
|
||||
set val ${default}
|
||||
gdb_test_multiple "print /d ${exp}" "$test" {
|
||||
-re "\\$\[0-9\]* = (\[-\]*\[0-9\]*).*$gdb_prompt $" {
|
||||
|
@ -5559,7 +5575,7 @@ proc get_integer_valueof { exp default } {
|
|||
|
||||
# Retrieve the value of EXP in the inferior, as an hexadecimal value
|
||||
# (using "print /x"). DEFAULT is used as fallback if print fails.
|
||||
# TEST is the test message to use. If can be ommitted, in which case
|
||||
# TEST is the test message to use. It can be omitted, in which case
|
||||
# a test message is built from EXP.
|
||||
|
||||
proc get_hexadecimal_valueof { exp default {test ""} } {
|
||||
|
@ -5579,8 +5595,12 @@ proc get_hexadecimal_valueof { exp default {test ""} } {
|
|||
return ${val}
|
||||
}
|
||||
|
||||
proc get_sizeof { type default } {
|
||||
return [get_integer_valueof "sizeof (${type})" $default]
|
||||
# Retrieve the size of TYPE in the inferior, as a decimal value. DEFAULT
|
||||
# is used as fallback if print fails. TEST is the test message to use.
|
||||
# It can be omitted, in which case a test message is 'sizeof (TYPE)'.
|
||||
|
||||
proc get_sizeof { type default {test ""} } {
|
||||
return [get_integer_valueof "sizeof (${type})" $default $test]
|
||||
}
|
||||
|
||||
proc get_target_charset { } {
|
||||
|
|
Loading…
Add table
Reference in a new issue