diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/gdb-caching-proc.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/cache.exp | 31 |
3 files changed, 38 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fb733df..8978617 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,11 @@ 2020-02-19 Tom de Vries <tdevries@suse.de> + * lib/cache.exp (ignore_pass, gdb_do_cache_wrap): New proc. + (gdb_do_cache): Use gdb_do_cache_wrap. + * gdb.base/gdb-caching-proc.exp (test_proc): Use gdb_do_cache_wrap. + +2020-02-19 Tom de Vries <tdevries@suse.de> + * lib/dtrace.exp (dtrace_build_usdt_test_program): Use quiet as gdb_compile option. diff --git a/gdb/testsuite/gdb.base/gdb-caching-proc.exp b/gdb/testsuite/gdb.base/gdb-caching-proc.exp index b2d71a5..3810347 100644 --- a/gdb/testsuite/gdb.base/gdb-caching-proc.exp +++ b/gdb/testsuite/gdb.base/gdb-caching-proc.exp @@ -28,7 +28,7 @@ proc test_proc { name } { set resultlist [list] - set first [$real_name] + set first [gdb_do_cache_wrap $real_name] lappend resultlist $first # Ten repetitions was enough to trigger target_supports_scheduler_locking, @@ -37,7 +37,7 @@ proc test_proc { name } { set racy 0 for {set i 0} {$i < $repeat} {incr i} { - set rerun [$real_name] + set rerun [gdb_do_cache_wrap $real_name] lappend resultlist $rerun if { $rerun != $first } { set racy 1 diff --git a/gdb/testsuite/lib/cache.exp b/gdb/testsuite/lib/cache.exp index dc57cab..25bfe02 100644 --- a/gdb/testsuite/lib/cache.exp +++ b/gdb/testsuite/lib/cache.exp @@ -17,6 +17,35 @@ # The in-memory cache. array set gdb_data_cache {} +# Print pass message msg into gdb.log +proc ignore_pass { msg } { + verbose -log "gdb_do_cache_wrap ignoring pass: $msg" +} + +# Call proc real_name and return the result, while ignoring calls to pass. +proc gdb_do_cache_wrap {real_name} { + if { [info procs save_pass] != "" } { + return [uplevel 2 $real_name] + } + + rename pass save_pass + rename ignore_pass pass + + set code [catch {uplevel 2 $real_name} result] + + rename pass ignore_pass + rename save_pass pass + + if {$code == 1} { + global errorInfo errorCode + return -code error -errorinfo $errorInfo -errorcode $errorCode $result + } elseif {$code > 1} { + return -code $code $result + } + + return $result +} + # A helper for gdb_caching_proc that handles the caching. proc gdb_do_cache {name} { @@ -46,7 +75,7 @@ proc gdb_do_cache {name} { } set real_name gdb_real__$name - set gdb_data_cache($cache_name) [uplevel 1 $real_name] + set gdb_data_cache($cache_name) [gdb_do_cache_wrap $real_name] if {[info exists GDB_PARALLEL]} { verbose "$name: returning '$gdb_data_cache($cache_name)' and writing file" 2 |