This moves the glean check out PiglitTest (since GleanTest doesn't descend from PiglitTest there could never be a PiglitTest with glean as an executable) and into GleanTest. If PIGLIT_PLATFORM is gbm glean tests will skip.
Signed-off-by: Dylan Baker <[email protected]> --- framework/exectest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/framework/exectest.py b/framework/exectest.py index 85ae04c..a185458 100644 --- a/framework/exectest.py +++ b/framework/exectest.py @@ -272,8 +272,6 @@ class PiglitTest(Test): """ if PIGLIT_PLATFORM == 'gbm': split_command = os.path.split(self._command[0])[1] - if 'glean' == split_command: - return True if split_command.startswith('glx-'): return True return False @@ -305,6 +303,11 @@ class GleanTest(Test): def command(self): return super(GleanTest, self).command + self.GLOBAL_PARAMS + def check_for_skip_scenario(self): + if PIGLIT_PLATFORM == 'gbm': + return True + return False + def interpret_result(self): if 'FAIL' in self.result['out'] or self.result['returncode'] != 0: self.result['result'] = 'fail' -- 2.0.0.rc2 _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
