projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
5767d55
)
validate:launcher: Do not take CK_DEFAULT_TIMEOUT into account to set the timeout
author
Thibault Saunier
<tsaunier@igalia.com>
Fri, 7 Dec 2018 02:17:29 +0000
(23:17 -0300)
committer
Thibault Saunier
<tsaunier@igalia.com>
Fri, 7 Dec 2018 02:17:29 +0000
(23:17 -0300)
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
patch
|
blob
|
history
diff --git
a/validate/launcher/apps/gstcheck.py
b/validate/launcher/apps/gstcheck.py
index
3d74081
..
d186a61
100644
(file)
--- 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),