From 8b696e31551d5cc7a3a01637c0a8d8246814a962 Mon Sep 17 00:00:00 2001 From: Yao Qi Date: Fri, 9 May 2014 15:06:12 +0800 Subject: [PATCH] Set timeout for gdb.reverse/*.exp test cases Hi, This patch is to add a new board setting gdb_reverse_timeout, which is used to set timeout for all gdb.reverse test cases, which are usually very slow and cause some TIMEOUT failures, for example, on some arm boards. We have some alternatives to this approach, but I am not satisfied with them: - Increase the timeout value. This is the global change, and it may cause some delay where actual failures happen. - Set timeout by gdb_reverse_timeout in every gdb.reverse/*.exp. Then, we have to touch every file under gdb.reverse. In this patch, we choose a central place to set timeout for all tests in gdb.reverse, which is convenient. gdb/testsuite: 2014-05-20 Yao Qi * lib/gdb.exp (gdb_init): Set timeout if test file is under gdb.reverse directory and gdb_reverse_timeout exists in board setting. * README: Document gdb_reverse_timeout. --- gdb/testsuite/ChangeLog | 7 +++++++ gdb/testsuite/README | 9 +++++++++ gdb/testsuite/lib/gdb.exp | 5 +++++ 3 files changed, 21 insertions(+) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 78826db3bb9..01a6b9232a2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2014-05-20 Yao Qi + + * lib/gdb.exp (gdb_init): Set timeout if test file is under + gdb.reverse directory and gdb_reverse_timeout exists in board + setting. + * README: Document gdb_reverse_timeout. + 2014-05-20 Yao Qi * lib/gdb.exp (default_gdb_init): Rename argument 'args' by diff --git a/gdb/testsuite/README b/gdb/testsuite/README index e6d5318164d..eadab57a7a3 100644 --- a/gdb/testsuite/README +++ b/gdb/testsuite/README @@ -203,6 +203,15 @@ The default value of the timeout is defined in the file `testsuite/config/unix.exp' (at least for Unix hosts; board files may have their own values). +gdb_reverse_timeout + +Defining this variable changes the default timeout duration when tests +under gdb.reverse directory are running. Process record and reverse +debugging is so slow that its tests have unexpected `TIMEOUT' test +failures. This global variable is useful to bump up the value of +`timeout' for gdb.reverse tests and doesn't cause any delay where +actual failures happen in the rest of the testsuite. + Board Settings ************** diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index a34ab3ae636..0fe6c31d773 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -3691,6 +3691,11 @@ proc gdb_init { test_file_name } { global timeout set timeout $gdb_test_timeout + if { [regexp ".*gdb\.reverse\/.*" $test_file_name] + && [target_info exists gdb_reverse_timeout] } { + set timeout [target_info gdb_reverse_timeout] + } + # If GDB_INOTIFY is given, check for writes to '.'. This is a # debugging tool to help confirm that the test suite is # parallel-safe. You need "inotifywait" from the -- 2.30.2