[RFC,gdb/testsuite] Ignore pass in gdb_caching_proc
Commit Message
[ was : Re: [committed][gdb/testsuite] Handle missing gnatmake in
gnat_runtime_has_debug_info ]
On 18-02-2020 10:39, Tom de Vries wrote:
> FWIW, I scanned a bit other gdb_caching_procs and there seems to be an
> idiom to handle hitting the default case of an expect using a warning,
> f.i. in skip_aarch64_sve_tests:
> ...
> default {
> warning "\n$me: default case taken"
> set skip_sve_tests 1
> }
> ...
> So we could use that at least for the last fail.
>
> Also, here and there verbose seems to be used instead of fail.
>
> The gdb_caching_procs seem to avoid explicitly calling pass and fail,
> but usage of gdb_test_multiple does happen a couple of time, which might
> result in fails etc (but then again, that might not have been
> intentional, I'm not sure).
>
> In any case, we could either:
> - forbid calling pass in gdb_caching_proc, or
> - more accommodatingly, ignore pass in gdb_caching_proc.
> Both by renaming pass in gdb_do_cache.
>
> Likewise, we could perhaps redirect fails to warnings.
This RFC patch implements "ignore pass in gdb_caching_proc".
Any comments?
Thanks,
- Tom
Comments
>>>>> "Tom" == Tom de Vries <tdevries@suse.de> writes:
Tom> +proc ignore_pass { msg } {
Tom> + verbose -log "gdb_do_cache_wrap ignoring pass: $msg"
Tom> +}
Tom> +
Tom> +proc gdb_do_cache_wrap {real_name} {
Tom> + if { [info procs save_pass] != "" } {
I think the new procs should have introductory comments, but other than
that, this seems fine to me.
Tom
[gdb/testsuite] Ignore pass in gdb_caching_proc
gdb/testsuite/ChangeLog:
2020-02-18 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.
---
gdb/testsuite/gdb.base/gdb-caching-proc.exp | 4 ++--
gdb/testsuite/lib/cache.exp | 29 ++++++++++++++++++++++++++++-
2 files changed, 30 insertions(+), 3 deletions(-)
@@ -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
@@ -17,6 +17,33 @@
# The in-memory cache.
array set gdb_data_cache {}
+proc ignore_pass { msg } {
+ verbose -log "gdb_do_cache_wrap ignoring pass: $msg"
+}
+
+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 +73,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