Patchwork Increase timeout in gdb.mi/list-thread-groups-available.exp

login
register
mail settings
Submitter Simon Marchi
Date Aug. 1, 2019, 7:16 p.m.
Message ID <9cc09b45-ba14-3299-6f99-b738c349ed94@efficios.com>
Download mbox | patch
Permalink /patch/33909/
State New
Headers show

Comments

Simon Marchi - Aug. 1, 2019, 7:16 p.m.
On 2019-08-01 2:18 p.m., Tom Tromey wrote:
>>>>>> "Simon" == Simon Marchi <simon.marchi@efficios.com> writes:
> 
> Simon> 	PR gdb/24863
> Simon> 	* gdb.mi/list-thread-groups-available.exp: Increase timeout for
> Simon> 	-list-thread-groups --available test.
> 
> Simon> +save_vars { timeout } {
> Simon> +    # Increase the timeout: when running with `make check-read1`, this can take
> Simon> +    # a bit of time, as there is a lot of output generated, hence a lot of read
> Simon> +    # syscalls.
> Simon> +    set timeout [expr $timeout * 10]
> 
> Maybe this should use with_timeout_factor.

Ah, totally, I forgot about its existence.  Here's a version using that.

From d55b3eb5acd69b87495c9eeb57f96e4228911dbc Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@efficios.com>
Date: Thu, 1 Aug 2019 10:28:52 -0400
Subject: [PATCH] Increase timeout in gdb.mi/list-thread-groups-available.exp

Running

    make check-read1 TESTS="gdb.mi/list-thread-groups-available.exp"

on my machine results in timeout failures.  Running it while having
`tail -F testsuite/gdb.log` on the side shows that the test is never
really blocked, it is just slow at consuming the large output generated
by `-list-thread-groups --available` (which lists all the processes on
the system).

If I increase the timeout to a large value, the test passes in ~30
seconds (compared to under 1 second normally).

Increase the timeout for the particular mi_gdb_test that is long to
execute under read1.  The new timeout value is a bit arbitrary.  The
default timeout is 10 seconds, so I set the new timeout to be
"old-timeout * 10", so 100 seconds in the typical case.

gdb/testsuite/ChangeLog:

	PR gdb/24863
	* gdb.mi/list-thread-groups-available.exp: Increase timeout for
	-list-thread-groups --available test.
---
 .../gdb.mi/list-thread-groups-available.exp         | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Patch

diff --git a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
index 792c3bac8962..2fbf282c661e 100644
--- a/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
+++ b/gdb/testsuite/gdb.mi/list-thread-groups-available.exp
@@ -54,10 +54,15 @@  set cores_re "cores=\\\[(\"$decimal\"(,\"$decimal\")*)?\\\]"
 # List all available processes.
 set process_entry_re "{${id_re},${type_re}(,$description_re)?(,$user_re)?(,$cores_re)?}"

-mi_gdb_test \
-    "-list-thread-groups --available" \
-    "\\^done,groups=\\\[${process_entry_re}(,$process_entry_re)*\\\]" \
-    "list available thread groups"
+# Increase the timeout: when running with `make check-read1`, this can take
+# a bit of time, as there is a lot of output generated, hence a lot of read
+# syscalls.
+with_timeout_factor 10 {
+    mi_gdb_test \
+	"-list-thread-groups --available" \
+	"\\^done,groups=\\\[${process_entry_re}(,$process_entry_re)*\\\]" \
+	"list available thread groups"
+}

 # List specific processes, make sure there are two entries.
 set spawn_id_1 [remote_spawn target $binfile]