Recent versions of the GL CTS report X connection errors on standard out. Support all variants by checking both stdout and stderr for the error string. --- framework/test/deqp.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/framework/test/deqp.py b/framework/test/deqp.py index 5b53efd..871ce25 100644 --- a/framework/test/deqp.py +++ b/framework/test/deqp.py @@ -220,7 +220,9 @@ class DEQPBaseTest(Test): """Rerun the command if X11 connection failure happens.""" for _ in range(5): super(DEQPBaseTest, self)._run_command(*args, **kwargs) - if "FATAL ERROR: Failed to open display" not in self.result.err: - return + x_err_msg = "FATAL ERROR: Failed to open display" + if x_err_msg in self.result.err or x_err_msg in self.result.out: + continue + return raise TestRunError('Failed to connect to X server 5 times', 'fail') -- 2.10.2 _______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit