On Mon, Jun 02, 2014 at 03:14:47PM +0100, Thomas Wood wrote: > The test list files are now required when determining the correct > location of the tests, so remove the fallback option of using make to > enumerate the tests. > > Signed-off-by: Thomas Wood <[email protected]>
Both patches are Acked-by: Daniel Vetter <[email protected]> -Daniel > --- > tests/igt.py | 20 ++------------------ > 1 file changed, 2 insertions(+), 18 deletions(-) > > diff --git a/tests/igt.py b/tests/igt.py > index 2b812a7..a970413 100644 > --- a/tests/igt.py > +++ b/tests/igt.py > @@ -207,24 +207,8 @@ class IGTTest(Test): > def listTests(listname): > oldDir = os.getcwd() > > - try: > - with open(path.join(igtTestRoot, listname + '.txt'), 'r') as f: > - lines = (line.rstrip() for line in f.readlines()) > - except IOError: > - try: > - os.chdir(igtTestRoot) > - proc = subprocess.Popen( > - ['make', 'list-' + listname], > - stdout=subprocess.PIPE, > - stderr=subprocess.PIPE, > - env=os.environ.copy(), > - universal_newlines=True > - ) > - out, err = proc.communicate() > - lines = out.split('\n') > - returncode = proc.returncode > - finally: > - os.chdir(oldDir) > + with open(path.join(igtTestRoot, listname + '.txt'), 'r') as f: > + lines = (line.rstrip() for line in f.readlines()) > > found_header = False > progs = "" > -- > 1.9.0 > > _______________________________________________ > Piglit mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/piglit -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ Piglit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/piglit
