On Tue, Nov 26, 2013 at 08:46:19PM +0100, Daniel Vetter wrote:
> On Tue, Nov 26, 2013 at 11:05:57AM -0800, Ben Widawsky wrote:
> > On Tue, Nov 26, 2013 at 09:09:04AM +0100, Daniel Vetter wrote:
> > > This is one of the nice pieces that I've never ported from the old
> > > make based test runner. Note that we only use the result of the check
> > > when actually running the testcases so that enumerating tests still
> > > works as non-root on arbitrary machines.
> > >
> >
> > So does this bail on the first test, or does this run for all tests?
>
> It bails each test individually. Since otherwise enumerating them wouldn't
> work any more. I've hoped the commit message was clear about it.
It wasn't clear to me, though it seemed to be the case from the diff.
I'd prefer an early bail, and just check once, and ideally, not
generating a JSON file at all.
>
> > BTW, Damien said he had also implemented this.
>
> Only in the make target he created, not in piglit itself. Imo we should
> have all the testrunner logic in one place, i.e. in the piglit sources.
> -Daniel
Damien, can you comment? I could have sworn you said something different
on IRC. It sounded like exactly what I wanted.
>
> >
> > > Cc: Ben Widawsky <ben@xxxxxxxxxxxx>
> > > Requested-by: Ben Widawsky <ben@xxxxxxxxxxxx>
> > > Signed-off-by: Daniel Vetter <daniel.vetter@xxxxxxxx>
> > > ---
> > > tests/igt.tests | 32 +++++++++++++++++++++++++++++++-
> > > 1 file changed, 31 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/tests/igt.tests b/tests/igt.tests
> > > index f3884925deaa..8d02c1a60255 100644
> > > --- a/tests/igt.tests
> > > +++ b/tests/igt.tests
> > > @@ -28,7 +28,7 @@ import sys
> > > import subprocess
> > >
> > > from os import path
> > > -from framework.core import testBinDir, TestProfile
> > > +from framework.core import testBinDir, TestProfile, TestResult
> > > from framework.exectest import ExecTest
> > >
> > > #############################################################################
> > > @@ -39,6 +39,24 @@ from framework.exectest import ExecTest
> > > ##### automatically add all tests into the 'igt' category.
> > > #############################################################################
> > >
> > > +def checkEnvironment():
> > > + debugfs_path = "/sys/kernel/debug/dri"
> > > + if os.getuid() != 0:
> > > + print "Test Environment check: not root!"
> > > + return False
> > > + if not os.path.isdir(debugfs_path):
> > > + print "Test Environment check: debugfs not mounted properly!"
> > > + return False
> > > + for subdir in os.listdir(debugfs_path):
> > > + clients = open(os.path.join(debugfs_path, subdir, "clients"), 'r')
> > > + lines = clients.readlines()
> > > + if len(lines) > 2:
> > > + print "Test Environment check: other drm clients running!"
> > > + return False
> > > +
> > > + print "Test Environment check: Succeeded."
> > > + return True
> > > +
> > > if not os.path.exists(os.path.join(testBinDir, 'igt')):
> > > print "igt symlink not found!"
> > > sys.exit(0)
> > > @@ -46,6 +64,8 @@ if not os.path.exists(os.path.join(testBinDir, 'igt')):
> > > # Chase the piglit/bin/igt symlink to find where the tests really live.
> > > igtTestRoot = path.join(path.realpath(path.join(testBinDir, 'igt')), 'tests')
> > >
> > > +igtEnvironmentOk = checkEnvironment()
> > > +
> > > profile = TestProfile()
> > >
> > > class IGTTest(ExecTest):
> > > @@ -54,6 +74,9 @@ class IGTTest(ExecTest):
> > > self.timeout = 60*20 # 20 minutes deadline by default
> > >
> > > def interpretResult(self, out, returncode, results, dmesg):
> > > + if not igtEnvironmentOk:
> > > + return out
> > > +
> > > if returncode == 0:
> > > results['result'] = 'dmesg-warn' if dmesg != '' else 'pass'
> > > elif returncode == 77:
> > > @@ -63,6 +86,13 @@ class IGTTest(ExecTest):
> > > return out
> > > def run(self, env):
> > > env.dmesg = True
> > > + if not igtEnvironmentOk:
> > > + results = TestResult()
> > > + results['result'] = 'skip'
> > > + results['info'] = unicode("Test Environment isn't OK")
> > > +
> > > + return results
> > > +
> > > return ExecTest.run(self, env)
> > >
> > > def listTests(listname):
> > > --
> > > 1.8.1.4
> > >
> >
> > --
> > Ben Widawsky, Intel Open Source Technology Center
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Ben Widawsky, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
