From 21e23c72fc2a90717ce5765c9ccd3944cbc2a2f6 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Thu, 6 Dec 2018 23:17:29 -0300 Subject: [PATCH] validate:launcher: Do not take CK_DEFAULT_TIMEOUT into account to set the timeout The timeout is what is set in the meson build definition otherwise we will not behave as 'meson test' which we should avoid --- validate/launcher/apps/gstcheck.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/validate/launcher/apps/gstcheck.py b/validate/launcher/apps/gstcheck.py index 3d74081..d186a61 100644 --- a/validate/launcher/apps/gstcheck.py +++ b/validate/launcher/apps/gstcheck.py @@ -44,9 +44,7 @@ class MesonTest(Test): child_env.update(test_infos['env']) self.child_env = child_env - timeout = int(child_env.pop( - 'CK_DEFAULT_TIMEOUT', test_infos['timeout'])) - + timeout = int(test_infos['timeout']) Test.__init__(self, test_infos['cmd'][0], name, options, reporter, timeout=timeout, hard_timeout=timeout, is_parallel=test_infos.get('is_parallel', True), -- 2.7.4