On Mon, 2018-03-26 at 11:53 -0700, Dylan Baker wrote:
> Quoting Juan A. Suarez Romero (2018-03-23 04:37:16)
> > Allow to run Crucible testsuite from piglit
> >
> > Signed-off-by: Juan A. Suarez Romero <jasua...@igalia.com>
> > ---
> > tests/crucible.py | 84
> > +++++++++++++++++++++++++++++++++++++++++++++++++++++++
> > 1 file changed, 84 insertions(+)
> > create mode 100644 tests/crucible.py
> >
> > diff --git a/tests/crucible.py b/tests/crucible.py
> > new file mode 100644
> > index 000000000..01787d28c
> > --- /dev/null
> > +++ b/tests/crucible.py
> > @@ -0,0 +1,84 @@
> > +# Copyright 2014-2016 Intel Corporation
> > +#
> > +# Permission is hereby granted, free of charge, to any person obtaining a
> > copy
> > +# of this software and associated documentation files (the "Software"), to
> > deal
> > +# in the Software without restriction, including without limitation the
> > rights
> > +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> > +# copies of the Software, and to permit persons to whom the Software is
> > +# furnished to do so, subject to the following conditions:
> > +#
> > +# The above copyright notice and this permission notice shall be included
> > in
> > +# all copies or substantial portions of the Software.
> > +#
> > +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
> > OR
> > +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> > +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> > THE
> > +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> > +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> > FROM,
> > +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> > IN THE
> > +# SOFTWARE.
> > +
> > +"""Piglit integrations for Crucible Test Suite.
> > +
> > +upstream: https://cgit.freedesktop.org/mesa/crucible/
> > +
> > +"""
> > +
> > +from __future__ import (
> > + absolute_import, division, print_function, unicode_literals
> > +)
> > +import os
> > +import subprocess
> > +
> > +from framework import grouptools, backends, exceptions
> > +from framework.core import PIGLIT_CONFIG
> > +from framework.profile import TestProfile, Test
> > +
> > +__all__ = ['profile']
> > +
> > +crucible_bin = os.environ.get('PIGLIT_CRUCIBLE_BIN', None)
> > +if crucible_bin is None:
> > + crucible_bin = PIGLIT_CONFIG.safe_get(('crucible', 'bin'), True)
> > +
> > +if crucible_bin is None:
> > + raise exceptions.PiglitFatalError(
> > + 'Cannot get "PIGLIT_CRUCIBLE_BIN" or conf value "crucible:bin"')
> > +
> > +
> > +class CrucibleTest(Test):
> > + """Test representation for Crucible"""
> > + def __init__(self, case_name):
> > + command = [crucible_bin, 'run', '--junit-xml=crucible.xml',
> > case_name]
> > + self._case = case_name
> > + super(CrucibleTest, self).__init__(command)
> > +
> > + def run(self):
> > + super(CrucibleTest, self).run()
>
> This isn't necessary, right?
>
Right :)
> > +
> > + def interpret_result(self):
> > + test = backends.junit.REGISTRY.load('crucible.xml', 'none')
> > + result = test.get_result(next(iter(test.tests.keys())))
>
> I think this should be:
> result = test.get_result(next(six.iterkeys(test.tests)))
>
I'll change it.
> > + self.result.result = result.name
> > + os.remove('crucible.xml')
> > + super(CrucibleTest, self).interpret_result()
> > +
> > +def gen_caselist_txt(bin_):
> > + with open('crucible.txt', 'w') as d:
> > + subprocess.check_call(
> > + [bin_, 'ls-tests'],
> > + stdout=d, stderr=d)
> > + assert os.path.exists('crucible.txt')
> > + return 'crucible.txt'
> > +
> > +def _populate_profile():
> > + profile = TestProfile()
> > + case_file = gen_caselist_txt(crucible_bin)
> > + with open(case_file, 'r') as caselist_file:
> > + for i, line in enumerate(caselist_file):
> > + case = line.rstrip()
> > + piglit_name = case.replace('.', grouptools.SEPARATOR)
> > + profile.test_list[piglit_name] = CrucibleTest(case)
> > + os.remove('crucible.txt')
> > + return profile
> > +
> > +profile = _populate_profile()
> > --
> > 2.14.3
>
> Other than those small nits this seems fine,
>
> Reviewed-by: Dylan Baker <dy...@pnwbakers.com>
Thanks!
J.A.
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/piglit
