[i-g-t,3/3] lib: only skip subsequent tests if a timeout occurs outside of a subtest

Commit Message

Thomas Wood Nov. 13, 2014, 11:59 a.m. UTC

Make timeout behaviour more consistent with igt_fail, where subsequent
subtests are only skipped if the failure occurs outside of a subtest.

Signed-off-by: Thomas Wood <[e-mail]>
---
 lib/igt_core.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

Patch

diff --git a/lib/igt_core.c b/lib/igt_core.c
index 3861121..b937f43 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -1481,9 +1481,6 @@  void igt_vlog(enum igt_log_level level, const char *format, va_list args)
 
 static void igt_alarm_handler(int signal)
 {
-	/* subsequent tests are skipped */
-	skip_subtests_henceforth = SKIP;
-
 	/* exit with timeout status */
 	igt_fail(IGT_EXIT_TIMEOUT);
 }
@@ -1492,11 +1489,13 @@  static void igt_alarm_handler(int signal)
  * igt_set_timeout:
  * @seconds: number of seconds before timeout
  *
- * Stop the current test and skip any subsequent tests after the specified
- * number of seconds have elapsed. The test will exit with #IGT_EXIT_TIMEOUT
- * status. Any previous timer is cancelled and no timeout is scheduled if
- * @seconds is zero.
+ * Fail a test and exit with #IGT_EXIT_TIMEOUT status after the specified
+ * number of seconds have elapsed. If the current test has subtests and the
+ * timeout occurs outside a subtest, subsequent subtests will be skipped and
+ * marked as failed.
  *
+ * Any previous timer is cancelled and no timeout is scheduled if @seconds is
+ * zero.
  */
 void igt_set_timeout(unsigned int seconds)
 {