diff options
| author | Mark Janes <mark.a.janes@intel.com> | 2017-01-06 14:24:43 -0800 |
|---|---|---|
| committer | Mark Janes <mark.a.janes@intel.com> | 2017-01-09 16:10:23 -0800 |
| commit | 58a6b051ffb2a02954286b43f722c41d0a7ec7c0 (patch) | |
| tree | db3769d8377e7ece8eca304457741573f48aa008 /framework | |
| parent | 1cb06d422c1c0ad6556806b02d54cb46a3ff34c1 (diff) | |
deqp: Search stdout and stderr for X connection failure
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.
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/test/deqp.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/framework/test/deqp.py b/framework/test/deqp.py index 5b53efded..871ce2545 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') |