From: Jan Vesely <jano.ves...@gmail.com> Signed-off-by: Jan Vesely <jano.ves...@gmail.com> --- framework/test/piglit_test.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/framework/test/piglit_test.py b/framework/test/piglit_test.py index b4e6eb444e0..0881f00a6d6 100644 --- a/framework/test/piglit_test.py +++ b/framework/test/piglit_test.py @@ -215,7 +215,8 @@ class PiglitCLTest(PiglitBaseTest): # pylint: disable=too-few-public-methods """ def __init__(self, command, run_concurrent=CL_CONCURRENT, **kwargs): - self.timeout = 60 + if self.timeout is None: + self.timeout = 60 super(PiglitCLTest, self).__init__(command, run_concurrent, **kwargs) -- 2.21.0 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit